Merge \\\\\\\\\"Fix GLES2 format mismatch\\\\\\\\\" into marshmallow-cts-dev am:...
authorStéphane Marchesin <marcheu@chromium.org>
Tue, 22 Aug 2017 17:27:15 +0000 (17:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 17:27:15 +0000 (17:27 +0000)
am: c0ccba0ca8

Change-Id: I7f9ce1665a06f912556b304da44c653f29865d06


Trivial merge