Merge \\\"Fix GLES2 format mismatch\\\" into marshmallow-cts-dev am: 98dd6ac745 am...
authorStéphane Marchesin <marcheu@chromium.org>
Wed, 27 Jul 2016 22:57:28 +0000 (22:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 27 Jul 2016 22:57:28 +0000 (22:57 +0000)
am: d2cc27ecd9

Change-Id: I5456eaaa1ff4f60db054e7f97649ef144d1ec4a1


Trivial merge