DO NOT MERGE CP vertex array test and warning fixes am: c63640e53a -s ours am: f840c...
authorJarkko Pyry <jpoyry@google.com>
Mon, 1 Aug 2016 19:50:42 +0000 (19:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 1 Aug 2016 19:50:42 +0000 (19:50 +0000)
am: 7d47fbfc18  -s ours

Change-Id: Id6c5816b213a5b22a96e991a67bd4f2949624185


Trivial merge