Merge "DO NOT MERGE CP vertex array test and warning fixes" into marshmallow-cts...
authorDaniel Xie <dxie@google.com>
Tue, 22 Aug 2017 17:47:24 +0000 (17:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 17:47:24 +0000 (17:47 +0000)
am: 125394f08a  -s ours

Change-Id: Ibae97018e2399d9fbfde4e831ac4c2c7d34b0589


Trivial merge