Joe Fernandez dce1356155 am d1c15f96: am 20f65201: am 0fbe1dfb: Merge "cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c" into honeycomb-mr2 ... * commit 'd1c15f96dd2e3b07da6968ea54f6f2bdebe8e190': cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c		2011-07-08 17:53:06 -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