Merge \\\\\\\\"DO NOT MERGE CP vertex array test and warning fixes\\\\\\\\" into...
authorJarkko Pöyry <jpoyry@google.com>
Mon, 1 Aug 2016 21:53:09 +0000 (21:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 1 Aug 2016 21:53:09 +0000 (21:53 +0000)
am: 697b769d40  -s ours

Change-Id: Ic554c5f8e2be7ba66e6d22f81421b5b231b4580f


Trivial merge