Conley Owens c66e2523b9 Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"		2011-06-09 11:12:04 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am 08d9d9a4: Merge "Runtime resource overlay, iteration 1."	2011-04-11 15:33:19 -07:00
libs	Add missing clean-up of idmap file descriptors.	2011-05-05 15:38:14 +02:00
opengl	Merge from gingerbread	2011-03-29 13:54:43 -07:00
services/surfaceflinger	Merge "Fixed to draw texture when loadTexture() is called at first time"	2011-04-29 10:00:12 -07:00
vpn	Phase 2 of test cleanup: moving test files from AndroidTests closer to their sources.	2010-01-29 13:35:51 -08:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	Fix omission in NOTICE file.	2011-01-18 15:25:32 -08:00