Dan Albert 7d83187103 Make string literal concatenation play nice with C++11. ... In C++11 mode, "foo"MACRO_THAT_EXPANDS_TO_STRING gets lexed as a user defined literal. Add space around the macro. Had missed these when resolving merge conflicts last night. Change-Id: I1a381a06c3909b76a3b44ce79c37aa6f244d3736		2014-09-09 09:21:28 -07: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	Make string literal concatenation play nice with C++11.	2014-09-09 09:21:28 -07:00
libs	resolved conflicts for merge of 86aeb9ef to lmp-dev-plus-aosp	2014-09-08 22:15:20 -07: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	Make IPowerManager native conform to .aidl for oneway	2014-09-05 17:12:24 -07:00
MODULE_LICENSE_APACHE2	…
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00