Fix GLES2 format mismatch am: 4b80682693 am: 9a9c641a84 am: 4faeff24d2 am: 2b2a5dfe41...
authorStphane Marchesin <marcheu@chromium.org>
Tue, 22 Aug 2017 18:16:47 +0000 (18:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:16:47 +0000 (18:16 +0000)
am: af9aaa875f

Change-Id: I461c086c0cac496b7ab6e4b06b058c5a563e37ed


Trivial merge