Wonsik Kim 8ce5c1cc8d Merge "Fill in sideband stream caveat"		2014-03-19 00:41:23 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	Merge "Remove deprecated BufferQueue constructor"	2014-03-17 18:46:14 +00:00
data/etc	Add device admin to wearables for API8 Compat	2014-03-17 12:19:18 -07:00
include	Merge "BufferItemConsumer: Use IGBC instead of BQ"	2014-03-18 17:55:06 +00:00
libs	Merge "Fill in sideband stream caveat"	2014-03-19 00:41:23 +00:00
opengl	am d4dabf87: am cdbf28b3: Merge "native frameworks: 64-bit compile issues"	2014-03-13 23:12:09 +00:00
services	Merge "Revert "Implement video plane layer""	2014-03-18 01:00:44 +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