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

Change-Id: Id196ac02467ac6c62183c55304042566ccace4b2


Trivial merge