Jesse Hall 539be3bb55 am f35a5ba6: (-s ours) am 649bafb7: Merge "bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)" into lmp-dev ... * commit 'f35a5ba664f53813c2fb7c903e5f4809ad029569':		2014-10-27 04:18:33 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am bf46706f: Merge "dumpstate: Add trusty version if driver is found" into lmp-mr1-dev	2014-10-20 22:07:49 +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 53aad5e7: am 3454f123: media: add kMetadataBufferTypeGraphicBuffer	2014-10-14 22:24:22 +00:00
libs	am dcc959be: Merge "Adding eglInitialize and eglTerminate image creation and deletion." into lmp-mr1-dev	2014-10-21 18:35:24 +00:00
opengl	am e9034b45: Merge "Use LOCAL_CLANG := false for GLES wrappers for now"	2014-10-16 03:06:42 +00:00
services	am 131866e1: Merge "Add glFlush in surfaceflinger screenshot code." into lmp-mr1-dev	2014-10-24 18:39:16 +00:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00