Dan Albert 58a81ba506 am 5273a978: resolved conflicts for merge of 86aeb9ef to lmp-dev-plus-aosp ... * commit '5273a978337cbee2c1aae2f4d5c1b0e9d8dd6e1c': Make string literal concatenation play nice with C++11.		2014-09-09 05:25:03 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am 51eec3b9: Merge "Fix relabeling of secondary user package directories."	2014-09-08 20:55:32 +00:00
data/etc	Merge "Add FEATURE_GAMEPAD." into lmp-dev	2014-09-08 23:21:35 +00:00
include	am 91b6028e: am d44fea68: Merge "Make IPowerManager native conform to .aidl for oneway" into lmp-dev	2014-09-08 17:04:24 +00:00
libs	am 5273a978: resolved conflicts for merge of 86aeb9ef to lmp-dev-plus-aosp	2014-09-09 05:25:03 +00:00
opengl	Don't try to capture the pointer when using PBOs for texture APIs	2014-08-19 17:03:54 +01:00
services	am 91b6028e: am d44fea68: Merge "Make IPowerManager native conform to .aidl for oneway" into lmp-dev	2014-09-08 17:04:24 +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