Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into HEAD
authorChris Forbes <chrisforbes@google.com>
Mon, 13 Aug 2018 23:39:34 +0000 (16:39 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 13 Aug 2018 23:39:34 +0000 (16:39 -0700)
am: d502cf9784

Change-Id: I62a6d0019f2883ff77e2137752fc0031a96da8c3


Trivial merge