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

Change-Id: Ie29c74f6daf660ef0bbb99e01bcc62804eb9bff5


Trivial merge