The Android Automerger 1e7441e64f merge in lmp-mr1-release history after reset to lmp-mr1-dev		2014-11-10 06:10:56 -08:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	Merge "installd: Set priority to background for dexopting" into lmp-mr1-dev	2014-11-06 02:43:56 +00: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	Frameworks/native: Fix unused parameter warning	2014-11-08 22:18:47 +00:00
libs	Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev	2014-11-07 19:44:31 +00:00
opengl	Add a BufferItem parameter to onFrameAvailable	2014-11-07 10:39:13 -08:00
services	Merge "Add a timeout for releasing SensorService wake_lock." into lmp-mr1-dev	2014-11-07 21:47:49 +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