DO NOT MERGE CP vertex array test and warning fixes am: c63640e53a -s ours am: f840c...
authorJarkko Pyry <jpoyry@google.com>
Mon, 1 Aug 2016 21:53:07 +0000 (21:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 1 Aug 2016 21:53:07 +0000 (21:53 +0000)
am: 58bfc529b7  -s ours

Change-Id: I043a595639e7fd1a5a7f0429b89e9568d510cd68


Trivial merge