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

Change-Id: I77f836ec3c7aa884787e8eae12114b3d260de278


Trivial merge