Fix GLES2 format mismatch am: 4b80682693 am: 9a9c641a84 am: 4faeff24d2
authorStphane Marchesin <marcheu@chromium.org>
Tue, 13 Sep 2016 19:04:31 +0000 (19:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 19:04:31 +0000 (19:04 +0000)
am: 2b2a5dfe41

Change-Id: Ie9140c7d9c482824d7ca5e7ff6723492aa9d195e


Trivial merge