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 03:49:15 +0000 (20:49 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Jul 2018 03:49:15 +0000 (20:49 -0700)
am: 4f5c080667

Change-Id: I4a0d60762e86b10431aa99861a5f711765ec4a3c


Trivial merge