Xavier Ducrohet c806fe1560 resolved conflicts for merge of a4350fc0 to gingerbread-plus-aosp ... Change-Id: I065af5d555fa2197847ad47c84003dcd11fe26c7		2011-02-24 16:15:11 -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 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
MODULE_LICENSE_APACHE2
NOTICE	Fix omission in NOTICE file.	2011-01-18 15:25:32 -08:00