Jeff Brown 975d9cf8f0 Merge "Rename remove callback methods."		2012-03-05 20:38:12 -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 "Add ATRACEs for Buffer indices"	2012-03-05 19:41:29 -08:00
opengl	fixup include paths	2012-03-05 15:59:38 -08:00
services/surfaceflinger	fixup include paths	2012-03-05 15:59:38 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00