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

Change-Id: I3d974c21212550c275d231d1602b0383907a7841


Trivial merge