Merge "Fix GLES2 format mismatch" into marshmallow-cts-dev am: 98dd6ac745 am: 5dee7d5...
authorDaniel Xie <dxie@google.com>
Tue, 22 Aug 2017 17:44:22 +0000 (17:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 17:44:22 +0000 (17:44 +0000)
am: dc19c7434c

Change-Id: If92b461561aedd0ae7017644bbf6e48b9860d871


Trivial merge