DO NOT MERGE CP vertex array test and warning fixes am: c63640e53a -s ours am: b136c...
authorJarkko Pyry <jpoyry@google.com>
Tue, 22 Aug 2017 17:47:11 +0000 (17:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 17:47:11 +0000 (17:47 +0000)
am: 28512eb821  -s ours

Change-Id: I860b4544992f144121c1898bca87c6fb55fb6b01


Trivial merge