Dave Allison 13c6fb1026 am 1649c77e: Merge "ART profiler" ... * commit '1649c77ed29eada5de32ace97033b9d898e9a6eb': ART profiler		2014-03-08 01:56:32 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am 1649c77e: Merge "ART profiler"	2014-03-08 01:56:32 +00:00
data/etc	Add new software features	2014-02-05 19:35:57 +00:00
include	am 37bf0789: Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.	2014-03-07 23:43:18 +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 112aa42e: Merge "SurfaceFlinger: fix 64-bit format string warnings"	2014-03-08 01:56:32 +00: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