Merge "DO NOT MERGE CP vertex array test and warning fixes" into marshmallow-cts...
authorDaniel Xie <dxie@google.com>
Thu, 25 Aug 2016 22:04:10 +0000 (22:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Aug 2016 22:04:10 +0000 (22:04 +0000)
am: 245bd3ffc4  -s ours

Change-Id: Ice096b7549e78143f62fb4491d600b4d4e1c208b


Trivial merge