DO NOT MERGE CP vertex array test and warning fixes am: c63640e53a -s ours am: f840c...
authorJarkko Pöyry <jpoyry@google.com>
Mon, 1 Aug 2016 20:07:41 +0000 (20:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 1 Aug 2016 20:07:41 +0000 (20:07 +0000)
am: 82252671f0

Change-Id: Ibf2028d2670ace8e921de0888093fc068660ea70


Trivial merge