Fix GLES2 format mismatch
authorStphane Marchesin <marcheu@chromium.org>
Wed, 27 Jul 2016 22:49:25 +0000 (22:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 27 Jul 2016 22:49:25 +0000 (22:49 +0000)
am: 4b80682693

Change-Id: Ib0d76f35894ea035c01b77dfd6b484d6eab32ad3


Trivial merge