Michael Wright b37c8c5453 Merge "Fixup more potential issues / warnings in string formats"		2014-06-10 20:16:08 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am 04eb4227: am c4193f1f: Merge "Migrate keychain directories to /data/misc/user/0"	2014-06-09 14:46:58 +00:00
data/etc	API Review: Update managed profiles feature flag.	2014-06-05 12:57:54 +00:00
include	Bump axis limit	2014-06-09 18:56:43 -07:00
libs	Merge "Fixup more potential issues / warnings in string formats"	2014-06-10 20:16:08 +00:00
opengl	am 17cbadf0: am 6fa169fa: Merge "Add aarch64 EGL/GLES trampolines"	2014-06-07 00:19:53 +00:00
services	am aefe55f0: Remove dependencies on runtime_libdvm and libdvm.so in general	2014-05-29 16:37:18 +00:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00