Merge \\\\\\\"Fix GLES2 format mismatch\\\\\\\" into marshmallow-cts-dev am: 98dd6ac7...
authorStéphane Marchesin <marcheu@chromium.org>
Thu, 28 Jul 2016 00:51:25 +0000 (00:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 28 Jul 2016 00:51:25 +0000 (00:51 +0000)
am: 5b2c510e5d

Change-Id: I9a97e55de4f50d7d520cd9e37daa71f80323f137


Trivial merge