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

Change-Id: Iaf348d31acaa40b54f51377558bf368d736a10b3


Trivial merge