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

Change-Id: I6171505266ec0b86adb02b088d885b2cbac6f40b


Trivial merge