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

Change-Id: Ibdc12d7910e3e5b0d9ce08b92fc154d8e0fef40d


Trivial merge