Michael Wright 52badfb341 am f8da9623: (-s ours) am 1298c7e5: Merge "Parse LED mappings in keylayout files. DO NOT MERGE" into klp-modular-dev ... * commit 'f8da9623f3f565d0be9ade3d3439c45aa23dd229': Parse LED mappings in keylayout files. DO NOT MERGE		2014-03-05 01:00:51 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am ad0f05be: am b98c4761: Merge "Correcting include path in installd test project\'s Android.mk"	2014-02-28 16:23:59 +00:00
data/etc	Add new software features	2014-02-05 19:35:57 +00:00
include	Merge "Split BufferQueue into core + producer + consumer"	2014-03-04 20:03:59 +00:00
libs	am 1738d4fc: am 462fb3a8: Merge "gui: Fix return code assert in CpuConsumer_test."	2014-03-04 22:35:04 +00:00
opengl	am eac548c6: am 61d6a008: Merge "hwc test: 64-bit compilation error"	2014-03-04 19:22:43 +00:00
services	Add touch.wake IDC property to control wakeup.	2014-02-26 18:49:36 -08:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00