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:57:21 +0000 (20:57 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Jul 2018 03:57:21 +0000 (20:57 -0700)
am: 3dbe2392e0

Change-Id: Id3ef31723825f737b0ef1cf8ffc2bf5119196700


Trivial merge