DO NOT MERGE CP vertex array test and warning fixes am: c63640e53a -s ours am: b136c...
authorJarkko Pyry <jpoyry@google.com>
Thu, 25 Aug 2016 23:16:34 +0000 (23:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Aug 2016 23:16:34 +0000 (23:16 +0000)
am: 54c18e5ac4

Change-Id: I4f6f9bcd89add6a32b18ccaa56f0ead88ac3cbd2


Trivial merge