Merge \\\\\\\"DO NOT MERGE CP vertex array test and warning fixes\\\\\\\" into marshm...
authorJarkko Pöyry <jpoyry@google.com>
Mon, 1 Aug 2016 20:02:09 +0000 (20:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 1 Aug 2016 20:02:09 +0000 (20:02 +0000)
am: 45a8f91070

Change-Id: I6cd3bdf830f1a56c412d22cde1dc12ae1a234b7a


Trivial merge