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:40:29 +0000 (23:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Aug 2016 23:40:29 +0000 (23:40 +0000)
am: 1465834a6f

Change-Id: I7704e976da42032c39d70889d5337531fee1a9cc


Trivial merge