Merge \\\\\\"Fix GLES2 format mismatch\\\\\\" into marshmallow-cts-dev am: 98dd6ac745...
authorDaniel Xie <dxie@google.com>
Wed, 27 Jul 2016 23:23:35 +0000 (23:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 27 Jul 2016 23:23:35 +0000 (23:23 +0000)
am: 730e4b0592

Change-Id: I5b0941a50db29d9e57d2e0a7ddc6a514041a1ca0


Trivial merge