Gloria Wang 17029ddb06 am a220a297: Merge "Initial OMA DRM forward lock contribution" ... * commit 'a220a2979937700024662be0f8fc166ca65506ed': Initial OMA DRM forward lock contribution		2011-01-13 11:11:51 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am a2977c38: Merge changes Ie03796ae,Ide3e980a into gingerbread	2010-12-07 14:22:56 -08:00
libs	am bec4abaa: Merge "Fix issue 3302649." into gingerbread	2011-01-12 13:52:42 -08:00
opengl	am e1752f41: Merge "fix [3258603] \'Quadrant\' benchmark crashes inside eglQueryContext on GB/Crespo" into gingerbread	2010-12-08 16:20:23 -08:00
services/surfaceflinger	am c724f2fb: disable the bypass mode. DO NOT MERGE.	2010-12-20 11:30:23 -08: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	Adding ASL2 attribution for VisualOn.	2011-01-13 09:24:30 -08:00