Gloria Wang 0e3e14faf6 Merge "Bug fixes in OMA DRM v1 Forward Lock Agent"		2011-08-04 14:20:53 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Fix a compiling error when trying to use setBufferCount	2011-08-02 16:57:20 -07:00
libs	am 3cf03987: Merge "Continue idmap generation even if name lookup fails."	2011-07-21 13:09:05 -07:00
opengl	Merge from gingerbread	2011-03-29 13:54:43 -07:00
services/surfaceflinger	am afffa8fa: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)	2011-06-15 14:13:04 -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
NOTICE	Fix omission in NOTICE file.	2011-01-18 15:25:32 -08:00