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:48:06 +0000 (19:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 1 Aug 2016 19:48:06 +0000 (19:48 +0000)
am: da626715a4

Change-Id: I1ea819ef29479058c52d9238af1b9b234e4bbb94


Trivial merge