Fix GLES2 format mismatch am: 4b80682693 am: 17f31733fd am: e3284ec499 am: ea8731ac09...
authorStéphane Marchesin <marcheu@chromium.org>
Wed, 27 Jul 2016 23:23:34 +0000 (23:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 27 Jul 2016 23:23:34 +0000 (23:23 +0000)
am: a327815593

Change-Id: Ia49d1a49f7d1909afaf9c01d1bd0d0be153c42fb


Trivial merge