The Android Automerger 3b7cb1ffc2 merge in master-release history after reset to 6b4e02f1cb		2014-05-17 05:51:01 -07:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am 449e0dbe: am fc1b9fa3: am b66ee6c3: Merge "Ensure that app lib symlinks are correctly labeled when created."	2014-05-13 20:41:41 +00:00
data/etc	am bd0f9153: am 7e6c5336: Merge "Adding a portrait and landscape file" into klp-modular-dev	2014-05-16 02:45:59 +00:00
include	Add KEYCODE_PAIRING.	2014-05-16 15:36:11 -07:00
libs	am 47d871b2: am d35e3af0: Set default values for FifoMaxEventCount and ReservedEventCount.	2014-05-13 00:54:50 +00:00
opengl	am 114d71ce: am 214b4a61: am 8155ce81: Merge "Remove unused LOCAL_LDLIBS."	2014-05-08 18:23:58 +00:00
services	BatteryProperty: Add property ENERGY_COUNTER and 64-bit integer properties	2014-05-16 03:05:11 +00:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00