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)
commit514fc784d3aa1e6dd77a0e1ec0ad75ae5b43374e
treec3fa922202e4a5f68d161c1e7fe3d604b4e3831f
parent17f31733fda3abbd1a125937a5c7c293594ca973
parent98dd6ac74570af5009106ab5d3b8ee71b9babe7d
Merge \"Fix GLES2 format mismatch\" into marshmallow-cts-dev
am: 98dd6ac745

Change-Id: I996941024609410453b5453ad249f73f1d710258