Michael Wright f8da9623f3 am 1298c7e5: Merge "Parse LED mappings in keylayout files. DO NOT MERGE" into klp-modular-dev ... * commit '1298c7e527fd242a39f9c0d53aa4f35d1c9decab': Parse LED mappings in keylayout files. DO NOT MERGE		2014-03-05 00:54:24 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am b98c4761: Merge "Correcting include path in installd test project\'s Android.mk"	2014-02-28 16:19:30 +00:00
data/etc	Add new software features	2014-02-05 19:35:57 +00:00
include	am 1298c7e5: Merge "Parse LED mappings in keylayout files. DO NOT MERGE" into klp-modular-dev	2014-03-05 00:54:24 +00:00
libs	am 1298c7e5: Merge "Parse LED mappings in keylayout files. DO NOT MERGE" into klp-modular-dev	2014-03-05 00:54:24 +00:00
opengl	am 61d6a008: Merge "hwc test: 64-bit compilation error"	2014-03-04 19:18:03 +00:00
services	am c9bf3ba4: Merge "Virtual Display async mode is overridden"	2014-02-25 21:51:10 +00:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00