Lajos Molnar 147372fdf9 resolved conflicts for merge of 67d8bd66 to lmp-mr1-dev-plus-aosp ... Change-Id: I5e7e6fdf0d2afe6c3e4a0ed6ef96afb4713a72bc		2014-09-19 06:23:46 -07:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am e1e3d278: Merge "Clean cruft out of makefiles."	2014-09-12 16:22:03 +00:00
data/etc	Add system feature for ConnectionService API support (2/3)	2014-09-15 09:13:10 -07:00
include	resolved conflicts for merge of 67d8bd66 to lmp-mr1-dev-plus-aosp	2014-09-19 06:23:46 -07:00
libs	resolved conflicts for merge of 67d8bd66 to lmp-mr1-dev-plus-aosp	2014-09-19 06:23:46 -07:00
opengl	am e1e3d278: Merge "Clean cruft out of makefiles."	2014-09-12 16:22:03 +00:00
services	resolved conflicts for merge of 67d8bd66 to lmp-mr1-dev-plus-aosp	2014-09-19 06:23:46 -07: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