Merge \\\\\\\\"Fix GLES2 format mismatch\\\\\\\\" into marshmallow-cts-dev am: 98dd6a...
authorDaniel Xie <dxie@google.com>
Tue, 22 Aug 2017 17:25:56 +0000 (17:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 17:25:56 +0000 (17:25 +0000)
am: cb36f63af9

Change-Id: Ie10247e35b4dec9089d0ddbfc4ab0057572f1a3b


Trivial merge