DO NOT MERGE CP vertex array test and warning fixes am: c63640e53a -s ours
authorJarkko Pyry <jpoyry@google.com>
Tue, 13 Sep 2016 18:46:55 +0000 (18:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 18:46:55 +0000 (18:46 +0000)
am: b136cc9a59  -s ours

Change-Id: Ie181e39e7e799eed5ec5f817fda809e86c082800


Trivial merge