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

Change-Id: Id7f3202c8d778f339e21c01c93fb70e455c8d194


Trivial merge