Merge \\\\\\\\\"Fix GLES2 format mismatch\\\\\\\\\" into marshmallow-cts-dev am:...
authorStéphane Marchesin <marcheu@chromium.org>
Thu, 28 Jul 2016 01:58:05 +0000 (01:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 28 Jul 2016 01:58:05 +0000 (01:58 +0000)
am: 74d432ebde

Change-Id: Id59fba35580f21b1feb6e9fcb54c4f63dae9ac3b


Trivial merge