Shimeng (Simon) Wang 8570e2fe08 Merge "Prevent set mInitialScale being overridden by mDefaultScale."		2011-07-08 16:48:23 -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	Fix EGLUtils::selectConfigForPixelFormat()	2011-07-08 14:37:05 -07:00
opengl	Add a simple EGL test	2011-07-08 14:40:39 -07:00
services/surfaceflinger	fix screen on/off animation (again)	2011-07-08 14:37:06 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00