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

Change-Id: I88fe42c55f28a7e2bb3daa0551e191469a4032a0


Trivial merge