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

Change-Id: I75200ce3544addfc5023e84f1577ce8749c2af1e