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

Change-Id: Iedc552312320cdd37b65d986a58f2c7e20075d8a


Trivial merge