Sreeram Ramachandran a055fd358b resolved conflicts for merge of 0d2bee0c to lmp-dev-plus-aosp ... Change-Id: If782ce04be50e2154cec232c9e9d60fe38f41831		2014-07-14 10:45:26 -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 0d2bee0c to lmp-dev-plus-aosp	2014-07-14 10:45:26 -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
NOTICE