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

Change-Id: Ifc9ce42029167b667fc7c3b3ace08f32d3b6c72c


Trivial merge