Fix GLES2 format mismatch am: 4b80682693 am: 9a9c641a84 am: 1369e6796f am: a13a4a71c6
authorStphane Marchesin <marcheu@chromium.org>
Thu, 25 Aug 2016 23:41:38 +0000 (23:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Aug 2016 23:41:38 +0000 (23:41 +0000)
am: 0fefe2c6dd

Change-Id: I45ee417da3380914d400f4982a950f8a31033bfc


Trivial merge