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

Change-Id: I4c62d0a774b9b5ee7b1ce6dbbf3d8d255c27198e


Trivial merge