Merge \\\\\\\\"DO NOT MERGE CP vertex array test and warning fixes\\\\\\\\" into...
authorDaniel Xie <dxie@google.com>
Mon, 1 Aug 2016 20:07:44 +0000 (20:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 1 Aug 2016 20:07:44 +0000 (20:07 +0000)
am: 449abdbd00

Change-Id: Ie559b189a41d87d0b7b93f47a9aacda5f5e44cfe


Trivial merge