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

Change-Id: I3f66c9046e6f681f2a1e8909d7e4f6c31153117a


Trivial merge