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

Change-Id: I2f4fcbed697cc61bbc7bb90b59646f0bad10701f


Trivial merge