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:29:39 +0000 (22:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Aug 2016 22:29:39 +0000 (22:29 +0000)
am: 92c0bc5e13

Change-Id: I24aa2d0710247781cec60f9c1910ea5c49f4ff67


Trivial merge