Nick Kralevich 0830ce19ae resolved conflicts for merge of 1aa9565c to master ... Change-Id: I30582926ab2d2e2b97cb95aaedcd54ba51832aba		2014-07-07 16:27:42 -07:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	resolved conflicts for merge of 1aa9565c to master	2014-07-07 16:27:42 -07:00
data/etc	API Review: Update managed profiles feature flag.	2014-06-05 12:57:54 +00:00
include	Fix non-portable definition of CryptoPlugin::SubSample	2014-07-01 14:54:45 -07:00
libs	Merge "BufferQueue: Add allocateBuffers method"	2014-06-27 15:56:14 +00:00
opengl	am 0cea0a22: am d284c4cd: Merge "Don\'t set LOCAL_MODULE_PATH for native tests."	2014-06-11 17:58:44 +00:00
services	Merge "BufferQueue: Add allocateBuffers method"	2014-06-27 15:56:14 +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