Dmitriy Ivanov 741625a17e resolved conflicts for merge of 37878b1e to lmp-mr1-dev-plus-aosp ... Change-Id: I748a7d2fb43fd63189f4688edbd0991e2b609dba		2014-11-11 16:08:29 -08:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	resolved conflicts for merge of 37878b1e to lmp-mr1-dev-plus-aosp	2014-11-11 16:08:29 -08: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	am 98d20f82: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev	2014-11-07 20:03:42 +00:00
opengl	am 98d20f82: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev	2014-11-07 20:03:42 +00:00
services	am a2614354: Merge "Add a timeout for releasing SensorService wake_lock." into lmp-mr1-dev	2014-11-07 22:01:03 +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