Jesse Hall 36707bcf31 am 16b65d40: am 0c2da971: am f05ef4e5: Merge "Surface: cancel the dequeued buffer when requestBuffer fails" into lmp-dev ... * commit '16b65d40755e2740f203577dba3142589c33f8a9':		2014-10-27 04:33:07 +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 f0ca2ade: am 53aad5e7: am 3454f123: media: add kMetadataBufferTypeGraphicBuffer	2014-10-14 22:29:56 +00:00
libs	am 15b2ecf5: am dcc959be: Merge "Adding eglInitialize and eglTerminate image creation and deletion." into lmp-mr1-dev	2014-10-21 18:43:47 +00:00
opengl	am 108e6334: am e9034b45: Merge "Use LOCAL_CLANG := false for GLES wrappers for now"	2014-10-16 03:13:15 +00:00
services	am 0b91d7e2: am 131866e1: Merge "Add glFlush in surfaceflinger screenshot code." into lmp-mr1-dev	2014-10-24 18:43:37 +00:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00