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

Change-Id: I0b36668636ccbf1a5f791c86cbc2be23acb051ea


Trivial merge