Xavier Ducrohet e32af36b39 am 4d21c773: am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc" ... * commit '4d21c7732c978a593dfa78f8da1fed7511b38e95': DO NOT MERGE. may fix build on some version of gcc		2011-07-27 14:01:23 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am 54146a63: Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread	2011-06-28 18:53:51 -07:00
libs	am 3cf03987: Merge "Continue idmap generation even if name lookup fails."	2011-07-21 13:09:05 -07:00
opengl	am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread	2011-02-23 12:46:57 -08: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