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

Change-Id: Ida51bb8f64b65e1d89b7f081b975505484271a93


Trivial merge