Lajos Molnar cc7432254e am c931ca1e: am 1d5d637d: Merge "implement asString() for OMX enumerations used by framework" into lmp-mr1-dev ... * commit 'c931ca1eec00218e70c039e965c8152daa1f4d0a': implement asString() for OMX enumerations used by framework		2014-11-14 19:19:32 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am 11bf9e5c: Merge "Add support for dalvik.vm.isa.<instruction set>.variant"	2014-11-14 00:30:33 +00:00
data/etc	am 60d31a0f: am 3c648e37: Update comment to use correct GPS file for wearable.	2014-09-19 22:02:37 +00:00
include	am c931ca1e: am 1d5d637d: Merge "implement asString() for OMX enumerations used by framework" into lmp-mr1-dev	2014-11-14 19:19:32 +00:00
libs	am 1f3ac8b4: am a4cff88d: Fix issue #18356768: some app process may hang at Runtime#exit...	2014-11-14 19:18:26 +00:00
opengl	am c5657b0c: am fecc0bf4: Merge "Frameworks/native: Add pragmas to glgen headers"	2014-11-12 19:12:59 +00:00
services	am d09cf8f1: am 9c17fb19: Merge "Frameworks/native: Wall Werror in batteryservice & powermanager"	2014-11-14 19:15:35 +00:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00