Merge remote-tracking branch 'khronos/vulkan-cts-1.0.2' into oreo-mr1-cts-dev am...
authorChris Forbes <chrisforbes@google.com>
Fri, 13 Jul 2018 04:36:57 +0000 (21:36 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Jul 2018 04:36:57 +0000 (21:36 -0700)
am: 5deca7d16a

Change-Id: I09d4b83db7d2efea31d1ed14601d52970a4bb13d


Trivial merge