The Android Automerger aeb3f1d837 merge in lmp-mr1-release history after reset to 2e5f8eaa7d		2014-10-14 06:11:29 -07:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	Accept socket connection before tracing.	2014-10-01 17:35:01 -07:00
data/etc	am 60d31a0f: am 3c648e37: Update comment to use correct GPS file for wearable.	2014-09-19 22:02:37 +00:00
include	Merge "BufferQueueProducer: Throttle EGL frame production." into lmp-mr1-dev	2014-10-08 16:50:13 +00:00
libs	am 9ea09757: Fix broken error check in Parcel::readBlob	2014-10-09 19:17:44 +00:00
opengl	Add rate-limited logging for unimplemented es functions.	2014-09-23 08:30:12 -07:00
services	am ffb49774: Improve ANR diagnostics.	2014-10-12 16:02:22 +00:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00