Merge "Fix GLES2 format mismatch" into marshmallow-cts-dev
authorDaniel Xie <dxie@google.com>
Wed, 27 Jul 2016 22:43:00 +0000 (22:43 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 27 Jul 2016 22:43:00 +0000 (22:43 +0000)

Trivial merge