Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into oreo-mr1-cts-dev
authorChris Forbes <chrisforbes@google.com>
Mon, 15 Oct 2018 23:09:13 +0000 (16:09 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 15 Oct 2018 23:09:13 +0000 (16:09 -0700)
am: d342579a4b

Change-Id: Id57cf5d3697bc52cd5d0fb78da17d430f8e0e62a


Trivial merge