Mike Lockwood 210e24c07e am 8b1a2774: am 754f16fc: Merge "Fix installd command line parser" ... * commit '8b1a27740dc9910ffbdf0df775056b6647fe111c': Fix installd command line parser		2014-11-21 12:19:01 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am 754f16fc: Merge "Fix installd command line parser"	2014-11-21 05:10:57 +00:00
data/etc	Merge "Issue #17551667: Voice interaction service should be disabled..." into lmp-mr1-dev	2014-11-17 18:33:21 +00:00
include	am eb0ad057: am a63caa19: Merge "omx: add (temporary) index for automatic video frc support" into lmp-mr1-dev	2014-11-20 23:19:33 +00:00
libs	resolved conflicts for merge of c1ced8bb to master	2014-11-20 15:16:22 -08:00
opengl	am 22536916: am 1bb53054: Merge "Fix class vs. struct mismatch"	2014-11-17 23:07:39 +00:00
services	am c894c204: Merge "C++11 compatibility."	2014-11-20 23:00: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