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

Change-Id: I507d753b7a89efd681e373cc20600ad515e6b292


Trivial merge