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 23:41:42 +0000 (23:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Aug 2016 23:41:42 +0000 (23:41 +0000)
am: 74ce10a66a  -s ours

Change-Id: Ic9e30ca88b21c3ea50456e9f443b48b279fc3bd4


Trivial merge