Merge "Fix GLES2 format mismatch" into marshmallow-cts-dev am: 98dd6ac745
authorDaniel Xie <dxie@google.com>
Thu, 25 Aug 2016 22:04:07 +0000 (22:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Aug 2016 22:04:07 +0000 (22:04 +0000)
am: 5dee7d519c

Change-Id: Ibcb76009f261152e15569719e5f776bc48207f15


Trivial merge