Merge \\\\\\\"DO NOT MERGE CP vertex array test and warning fixes\\\\\\\" into marshm...
authorJarkko Pöyry <jpoyry@google.com>
Mon, 1 Aug 2016 20:02:22 +0000 (20:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 1 Aug 2016 20:02:22 +0000 (20:02 +0000)
am: c0a305c1de

Change-Id: I1d9f8809a871c82b8ce12768d96341f12e18b94c


Trivial merge