Mathias Agopian 7e918860f9 Merge "don't kill surfaceflinger when system process dies"		2011-07-06 11:10:31 -07:00
cmds	Revert "Add keychain user with special keystore access permissions"	2011-06-30 22:59:13 -07:00
include	Merge "return an error code with gralloc buffer allocation failures"	2011-07-06 11:09:55 -07:00
libs	Merge "fix ScreenshotsOfProtectedBuffersFail"	2011-07-06 11:10:06 -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	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00