Merge \"Fix GLES2 format mismatch\" into marshmallow-cts-dev
authorStéphane Marchesin <marcheu@chromium.org>
Wed, 27 Jul 2016 22:49:27 +0000 (22:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 27 Jul 2016 22:49:27 +0000 (22:49 +0000)
am: 98dd6ac745

Change-Id: I996941024609410453b5453ad249f73f1d710258


Trivial merge