Dan Albert 9e8b528926 resolved conflicts for merge of 07c9557f to lmp-dev-plus-aosp ... Change-Id: Ic212ab2ee90b1cc7db7203210b047c870bb5c476		2014-09-12 09:00:50 -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 07c9557f to lmp-dev-plus-aosp	2014-09-12 09:00:50 -07:00
data/etc	Merge "Add feature flags for verified boot and securely remove users." into lmp-dev	2014-09-10 10:07:49 +00:00
include	am 8493b79e: SensorService fixes	2014-09-12 05:36:58 +00:00
libs	am 4a7001ca: Merge "Work around C11 const atomic restrictions."	2014-09-12 15:54:52 +00:00
opengl	am 4c5b9acf: Merge "Don\'t try to capture the pointer when using PBOs for texture APIs" into lmp-dev	2014-08-20 16:32:37 +00:00
services	am 8493b79e: SensorService fixes	2014-09-12 05:36:58 +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