Romain Guy 076a3c7fb1 Merge "Cleanup"		2011-07-07 21:35:19 -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 "SurfaceTexture: enable newly passing tests."	2011-07-07 14:42:12 -07:00
opengl
services/surfaceflinger	Merge "don't kill surfaceflinger when system process dies"	2011-07-06 11:10:31 -07:00
MODULE_LICENSE_APACHE2
NOTICE