Narayan Kamath 7f8ecd6dba am cde4b13a: Merge "Allow more than one dex2oat extra option" ... * commit 'cde4b13a12a0bc8a7bd031f5d5c1b2b2bdd13335': Allow more than one dex2oat extra option		2014-10-01 11:18:25 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am cde4b13a: Merge "Allow more than one dex2oat extra option"	2014-10-01 11:18:25 +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	resolved conflicts for merge of 67d8bd66 to lmp-mr1-dev-plus-aosp	2014-09-19 06:23:46 -07:00
libs	am 6ee97e74: Merge "Fix a null dereference."	2014-09-23 17:54:39 +00:00
opengl	am 12c4bdad: Add rate-limited logging for unimplemented es functions.	2014-09-23 19:41:45 +00:00
services	am 71e351d9: Merge "Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections."" into lmp-dev	2014-09-27 06:17:21 +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