Merge "Fix GLES2 format mismatch" into marshmallow-cts-dev
authorDaniel Xie <dxie@google.com>
Thu, 25 Aug 2016 20:52:40 +0000 (20:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Aug 2016 20:52:40 +0000 (20:52 +0000)
am: 98dd6ac745

Change-Id: I849a65a2f31bf0203935d3c73369c3e777a71c66


Trivial merge