Dan Albert 41a0ef3e28 resolved conflicts for merge of 4037c458 to master ... Change-Id: I8a2e73b7ba48b790054e0ab99f81b2693244389e		2014-11-14 11:13:20 -08:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	resolved conflicts for merge of 37878b1e to lmp-mr1-dev-plus-aosp	2014-11-11 16:08:29 -08:00
data/etc	am 60d31a0f: am 3c648e37: Update comment to use correct GPS file for wearable.	2014-09-19 22:02:37 +00:00
include	Merge "Enable clang for libui/libgui/surfaceflinger"	2014-11-12 20:14:29 +00:00
libs	Merge "Enable clang for libui/libgui/surfaceflinger"	2014-11-12 20:14:29 +00:00
opengl	am c5657b0c: am fecc0bf4: Merge "Frameworks/native: Add pragmas to glgen headers"	2014-11-12 19:12:59 +00:00
services	resolved conflicts for merge of 4037c458 to master	2014-11-14 11:13:20 -08: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