Irfan Sheriff ee48a84775 Merge "Fix WifiManager async API"		2012-03-01 16:26:52 -08:00
cmds/surfaceflinger	Move keystore to system/security repo	2012-02-15 15:55:21 -08:00
include	Instead of hardcoding OMX component names in our code, support	2012-03-01 11:30:10 -08:00
libs	Merge "Fixed several 64-bit porting issues"	2012-02-29 16:41:55 -08:00
opengl	Add tracing to various graphics components.	2012-02-27 17:50:35 -08:00
services/surfaceflinger	Merge "a window could get stuck to gpu composition"	2012-02-27 19:48:36 -08: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