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

Change-Id: I29c8bc4b858cbcfc394891eb7cdc25b7f544e87d


Trivial merge