Kazuhiro Ondo 860529197d am 6716ac53: am c8e2916d: Bring back ERI into CDMA-LTE mode ... * commit '6716ac5342de7e83e5ba47f28aac40a46d1363ac': Bring back ERI into CDMA-LTE mode		2011-07-07 11:22:10 -07:00
cmds	Revert "Add keychain user with special keystore access permissions"	2011-06-30 22:59:13 -07:00
include	Merge "Add Thread::join"	2011-07-06 11:37:53 -07:00
libs	Merge "Add Thread::join"	2011-07-06 11:37:53 -07:00
opengl	fix x86 build	2011-05-23 17:48:36 -07:00
services/surfaceflinger	Merge "don't kill surfaceflinger when system process dies"	2011-07-06 11:10:31 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00