The Android Automerger 38234af6bd merge in klp-release history after reset to klp-dev		2013-10-06 06:01:27 -07:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	Fix issue #10422349: Limit/change the battery history data in batterystats	2013-09-04 18:04:14 -07:00
data/etc	Add feature android.hardware.consumerir xml file	2013-10-03 13:09:37 -07:00
include	Merge "Allow blaming a single uid for work done" into klp-dev	2013-10-03 16:34:51 +00:00
libs	BufferQueue: fix a test crash	2013-10-02 18:02:28 +00:00
opengl	GLConsumer: start using EGL_ANDROID_image_crop	2013-10-02 17:34:35 +00:00
services	Merge "Allow blaming a single uid for work done" into klp-dev	2013-10-03 16:34:51 +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