Gilles Debunne a8b288d285 resolved conflicts for merge of c0728cc0 to gingerbread-plus-aosp ... Change-Id: I1b941e0610e498365d441c7bd23af276d1b5f986		2011-02-08 16:33:58 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am a6fb375c: am 056340ac: Merge "stubs"	2011-01-31 12:03:59 -08:00
libs	am e88fa50b: Merge from open-source gingerbread	2011-01-30 16:19:59 -08:00
opengl	am a6fb375c: am 056340ac: Merge "stubs"	2011-01-31 12:03:59 -08:00
services/surfaceflinger	am 239fd805: Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread	2011-01-25 14:46:40 -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