Merge \\\\\\\"DO NOT MERGE CP vertex array test and warning fixes\\\\\\\" into marshm...
authorDaniel Xie <dxie@google.com>
Tue, 22 Aug 2017 17:28:04 +0000 (17:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 17:28:04 +0000 (17:28 +0000)
am: 1433edc217  -s ours

Change-Id: If5506acc65d83615c5c2d702e1d7c4669b1be62c


Trivial merge