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

Change-Id: I091ea77ebbe15d9078a8974e10238f9f6a8a7390


Trivial merge