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:04:34 +0000 (19:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 19:04:34 +0000 (19:04 +0000)
am: b3208d09b8  -s ours

Change-Id: I64bc89088ab25bd7a1bf8f434a1bde626575e332


Trivial merge