The Android Automerger 488dded468 merge in lmp-mr1-release history after reset to 5acc751ffe		2014-10-09 06:10:56 -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 "Fix sockfd leakage in SensorService." into lmp-dev	2014-10-03 21:45:37 +00:00
libs	Merge "Parcel: extra validation/debug code for writeDupFileDescriptor" into lmp-dev	2014-10-06 22:36:54 +00:00
opengl	Add rate-limited logging for unimplemented es functions.	2014-09-23 08:30:12 -07:00
services	am 7830ef3d: Change ordering of memory allocation and calling Thread::run().	2014-10-08 05:24:50 +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