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

Change-Id: Iad8dc5745069250d0260e3a4f04898fc5e1b8d86


Trivial merge