Fix GLES2 format mismatch am: 4b80682693
authorStéphane Marchesin <marcheu@chromium.org>
Wed, 27 Jul 2016 22:53:24 +0000 (22:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 27 Jul 2016 22:53:24 +0000 (22:53 +0000)
am: 17f31733fd

Change-Id: Ia5625e84621ed7b193d67391f278410b9bef83e0


Trivial merge