Merge \\"Fix GLES2 format mismatch\\" into marshmallow-cts-dev am: 98dd6ac745
authorDaniel Xie <dxie@google.com>
Wed, 27 Jul 2016 22:53:25 +0000 (22:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 27 Jul 2016 22:53:25 +0000 (22:53 +0000)
commitd2cc27ecd9a0174a183644db7e96a0b7dab6ee90
treec3fa922202e4a5f68d161c1e7fe3d604b4e3831f
parente3284ec49954b507897d00938b98a421e704347b
parent514fc784d3aa1e6dd77a0e1ec0ad75ae5b43374e
Merge \\"Fix GLES2 format mismatch\\" into marshmallow-cts-dev am: 98dd6ac745
am: 514fc784d3

Change-Id: Ie29c74f6daf660ef0bbb99e01bcc62804eb9bff5