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

Change-Id: Ibbc71c1204a46b010e8a98d0bef16c878620155c


Trivial merge