Dan Stoza 21f18e6935 Merge "Add unique ID to GraphicBuffer"		2014-04-11 18:56:04 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am 236ed6d3: am 82fb5809: Merge "restorecon the profile directory."	2014-04-09 19:49:43 +00:00
data/etc	Add android.software.managedprofiles feature flag.	2014-04-01 12:20:58 +01:00
include	Merge "Add unique ID to GraphicBuffer"	2014-04-11 18:56:04 +00:00
libs	Merge "Add unique ID to GraphicBuffer"	2014-04-11 18:56:04 +00:00
opengl	Merge "Temporarily turn on callstack logging"	2014-04-09 17:06:06 +00:00
services	Merge "BufferQueue: Add producer buffer-released callback"	2014-04-11 17:57:12 +00: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