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

Change-Id: Ife742cdd47f8d4635225fe4fdd35acd3be5d5af9


Trivial merge