DO NOT MERGE CP vertex array test and warning fixes am: c63640e53a -s ours am: b136c...
authorJarkko Pyry <jpoyry@google.com>
Thu, 25 Aug 2016 22:48:20 +0000 (22:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Aug 2016 22:48:20 +0000 (22:48 +0000)
am: 6a9945d0ea

Change-Id: Iee2be0dade670d25e507bff9ddfdd5d40b3f98c9


Trivial merge