Dan Albert 6efc505bd8 am 09b9193d: Merge "Fix -Werror on 64-bit builds" ... * commit '09b9193d10b3849e426c5370a757a0eedc65a7ff': Fix -Werror on 64-bit builds		2014-12-05 18:01:50 +00: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	am 35df7531: Merge "libui: Enable -Weverything and -Werror"	2014-12-05 18:01:49 +00:00
libs	am 09b9193d: Merge "Fix -Werror on 64-bit builds"	2014-12-05 18:01:50 +00:00
opengl	am f8954c81: Merge "OpenGL tests: Fix unused variables"	2014-12-02 18:47:20 +00:00
services	am 5588d900: Merge "Enable clang for libui/libgui/surfaceflinger"	2014-12-05 18:01:48 +00:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00