Vikram Aggarwal 8570155676 Merge "affect -> effect and incorrect possessive"		2012-02-27 12:36:53 -08:00
cmds/surfaceflinger	Move keystore to system/security repo	2012-02-15 15:55:21 -08:00
include	Merge "Removed dependecies between BufferQueue and SurfaceTexture"	2012-02-26 17:06:42 -08:00
libs	Merge "Removed dependecies between BufferQueue and SurfaceTexture"	2012-02-26 17:06:42 -08:00
opengl	Merge "gltrace: Make code 64-bit safe."	2012-02-27 12:31:01 -08:00
services/surfaceflinger	remove libui dependency on libEGL	2012-02-24 16:42:46 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00