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

Change-Id: I74429448014134828b925aea1f3c43e527aa5099


Trivial merge