Dmitriy Ivanov d9799072de resolved conflicts for merge of e9b6f1f7 to lmp-mr1-dev-plus-aosp ... Change-Id: I87618573198d1f476b1680dbf9163a7dc90a66f8		2014-12-10 16:10:44 -08:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am e8a4dce8: Merge "Work on issue #18486438: Reduce size of bugreport output" into lmp-mr1-dev	2014-11-25 17:36:43 +00:00
data/etc	Revert "Camera: Add XML entries and files for new system features"	2014-12-03 11:13:06 -08:00
include	libgui: Enable -Weverything and -Werror	2014-12-05 14:59:29 -08:00
libs	am a59d7a6a: Merge "GUI: Remove unused variables"	2014-12-09 20:09:18 +00:00
opengl	am f8954c81: Merge "OpenGL tests: Fix unused variables"	2014-12-02 18:47:20 +00:00
services	libgui: Enable -Weverything and -Werror	2014-12-05 14:59:29 -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