Fix GLES2 format mismatch am: 4b80682693 am: 17f31733fd am: e3284ec499
authorStéphane Marchesin <marcheu@chromium.org>
Wed, 27 Jul 2016 23:02:57 +0000 (23:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 27 Jul 2016 23:02:57 +0000 (23:02 +0000)
am: ea8731ac09

Change-Id: Iea9125f946b308e830450a27684a8055f350eef2


Trivial merge