DO NOT MERGE CP vertex array test and warning fixes am: c63640e53a -s ours am: f840c...
authorJarkko Pöyry <jpoyry@google.com>
Mon, 1 Aug 2016 19:56:13 +0000 (19:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 1 Aug 2016 19:56:13 +0000 (19:56 +0000)
am: 20df90f956

Change-Id: I4629c90bb414665ef3f09ed95b63782a9c5b9b00


Trivial merge