Merge "Fix GLES2 format mismatch" into marshmallow-cts-dev am: 98dd6ac745 am: 5dee7d5...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 20:11:40 +0000 (20:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 20:11:40 +0000 (20:11 +0000)
am: da92c80fcf

Change-Id: I3994ddaf638e624f14cd9e4df1e82e9fe50c00e0


Trivial merge