Merge \"DO NOT MERGE CP vertex array test and warning fixes\" into marshmallow-cts-dev
authorJarkko Pöyry <jpoyry@google.com>
Mon, 1 Aug 2016 19:40:38 +0000 (19:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 1 Aug 2016 19:40:38 +0000 (19:40 +0000)
am: b9c3777b77  -s ours

Change-Id: I61fdf061a9d18682387f51d22589794ca2bd2004


Trivial merge