Merge "DO NOT MERGE CP vertex array test and warning fixes" into marshmallow-cts...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 18:46:55 +0000 (18:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 18:46:55 +0000 (18:46 +0000)
am: 245bd3ffc4  -s ours

Change-Id: I96c93068b1bb4040ffbac15bd3cef9ae2340d2f1


Trivial merge