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

Change-Id: I270a5dcda5c7e75f64a45a769feae5dc55369abf


Trivial merge