Xavier Ducrohet 13fbf42721 Merge "Merge 1911a6f7 into gingerbread. do not merge." into gingerbread		2011-02-28 12:24:01 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)	2011-01-25 14:19:13 -08:00
libs	Merge from open-source gingerbread	2011-01-30 15:30:03 -08:00
opengl	egl: fixes for object refcounts	2011-02-22 18:15:08 -08:00
services/surfaceflinger	Prevent SurfaceFlinger from using layer token 31.	2011-02-10 16:18: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