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:11:26 +0000 (19:11 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Jul 2018 02:11:26 +0000 (19:11 -0700)
am: f76e580fa8

Change-Id: Ieb0eae5a1356d251a38221b7a6b28e16db01fa96


Trivial merge