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

Change-Id: Id95cd8b06d15482f4c69f1ae56a769f3c7fb1b0a


Trivial merge