Merge "Fix GLES2 format mismatch" into marshmallow-cts-dev am: 98dd6ac745 am: 5dee7d5...
authorDaniel Xie <dxie@google.com>
Tue, 22 Aug 2017 17:46:54 +0000 (17:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 17:46:54 +0000 (17:46 +0000)
am: c9a28c5854

Change-Id: I21fbb557831633b9a8f12cd57a9d717d5bb496af


Trivial merge