The Android Automerger 48ddeb7db7 merge in lmp-mr1-release history after reset to bf46706f36		2014-10-21 06:12:38 -07:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	dumpstate: Add trusty version if driver is found	2014-10-16 16:11:07 -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	am 3454f123: media: add kMetadataBufferTypeGraphicBuffer	2014-10-14 19:56:24 +00:00
libs	am 649bafb7: Merge "bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)" into lmp-dev	2014-10-20 14:17:18 +00:00
opengl	Add rate-limited logging for unimplemented es functions.	2014-09-23 08:30:12 -07:00
services	Merge "Link sigchain to surfaceflinger main executable" into lmp-mr1-dev	2014-10-20 17:14:44 +00:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00