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

Change-Id: I899dcde79abf191d2b72aec732a90b59349cbf86


Trivial merge