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

Change-Id: Iad13015f9b3e5bca530712d578c59ca1312c22e7


Trivial merge