DO NOT MERGE CP vertex array test and warning fixes am: c63640e53a -s ours am: b136c...
authorJarkko Pyry <jpoyry@google.com>
Tue, 13 Sep 2016 19:01:33 +0000 (19:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 19:01:33 +0000 (19:01 +0000)
am: 20259b77cc  -s ours

Change-Id: I59aea5b40c8b02f3d761717dfd18b5293f344229


Trivial merge