Andreas Gampe 4037c458a7 resolved conflicts for merge of 07dffa18 to lmp-mr1-dev-plus-aosp ... Change-Id: I42d8bc291f4f48f3098754b076889159c4b20e41		2014-11-13 15:16:53 -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	am ca69e8f2: Merge "Add tracking of parcel memory allocations." into lmp-mr1-dev	2014-11-12 03:51:05 +00:00
libs	am ca69e8f2: Merge "Add tracking of parcel memory allocations." into lmp-mr1-dev	2014-11-12 03:51:05 +00:00
opengl	am fecc0bf4: Merge "Frameworks/native: Add pragmas to glgen headers"	2014-11-12 18:40:21 +00:00
services	resolved conflicts for merge of 07dffa18 to lmp-mr1-dev-plus-aosp	2014-11-13 15:16:53 -08:00
MODULE_LICENSE_APACHE2
NOTICE