Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into oreo-mr1-cts-dev
authorChris Forbes <chrisforbes@google.com>
Fri, 13 Jul 2018 02:09:22 +0000 (19:09 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Jul 2018 02:09:22 +0000 (19:09 -0700)
am: f76e580fa8

Change-Id: I3d6f0a34c3655ac0992c10441c39dc7e35b23df4


Trivial merge