Xavier Ducrohet c6a02ff532 am edbd6139: Merge "Merge 1911a6f7 into gingerbread. do not merge." into gingerbread ... * commit 'edbd6139b9d699879db2f14fb03b7b6a38bab9ea': Merge 1911a6f7 into gingerbread. do not merge.		2011-02-28 12:29:08 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am 93552de8: Merge "stubs"	2011-02-11 09:54:59 -08:00
libs	am e88fa50b: Merge from open-source gingerbread	2011-01-30 16:19:59 -08:00
opengl	am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread	2011-02-23 12:46:57 -08:00
services/surfaceflinger	am 919853ce: Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbread	2011-02-27 15:44:36 -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
NOTICE	Fix omission in NOTICE file.	2011-01-18 15:25:32 -08:00