The Android Automerger 86e63d6297 merge in lmp-mr1-release history after reset to 91c395f6c3		2014-10-18 06:11:01 -07:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	Migrate CA certificates to all users	2014-10-15 19:04:33 +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	am 3454f123: media: add kMetadataBufferTypeGraphicBuffer	2014-10-14 19:56:24 +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	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