Jamie Gennis 0e1080f887 Merge "SurfaceTexture: add context attach & detach"		2012-04-01 15:41:24 -07:00
build	build: add device-type dalvik heap configs	2012-03-23 09:42:42 -07:00
cmds	move dumpstate and dumpsys from frameworks/base to frameworks/native	2012-03-26 12:39:26 -07:00
data/etc	move hardware feature definitions	2012-03-26 16:30:59 -07:00
include	Merge "SurfaceTexture: add context attach & detach"	2012-04-01 15:41:24 -07:00
libs	Merge "SurfaceTexture: add context attach & detach"	2012-04-01 15:41:24 -07:00
opengl	Merge "frameworks/native: prevent some opengl tests from building in pdk"	2012-03-27 10:28:58 -07:00
services	Merge "better workaround for bug: 6020860"	2012-03-29 12:25:45 -07: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