Merge "Fix GLES2 format mismatch" into marshmallow-cts-dev am: 98dd6ac745 am: 5dee7d519c
authorDaniel Xie <dxie@google.com>
Thu, 25 Aug 2016 22:29:39 +0000 (22:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Aug 2016 22:29:39 +0000 (22:29 +0000)
am: ad2ff2cee6

Change-Id: I2c5b9b21296f89892cb2238aebbd9326a55114e2


Trivial merge