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:43:05 +0000 (23:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Aug 2016 23:43:05 +0000 (23:43 +0000)
am: 44e736e1a3  -s ours

Change-Id: I28f4179b5a005ed3a33d861b3106ada6d9648892


Trivial merge