Fix GLES2 format mismatch am: 4b80682693
authorStphane Marchesin <marcheu@chromium.org>
Thu, 25 Aug 2016 22:04:05 +0000 (22:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Aug 2016 22:04:05 +0000 (22:04 +0000)
am: 9a9c641a84

Change-Id: I9a55d673f77d5a195cee11cddaaf0d8c06cacf2b


Trivial merge