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

Change-Id: Ifc173728aa83dcd753de8b6b61f26c795e15f7da


Trivial merge