Merge "Merge remote-tracking branch 'origin/vulkan-cts-1.0.2' into HEAD" into oreo...
authorChris Forbes <chrisforbes@google.com>
Tue, 13 Feb 2018 21:32:59 +0000 (21:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Feb 2018 21:32:59 +0000 (21:32 +0000)
am: 782e3722be

Change-Id: Ic1ca6d14bc5dca8f1f563d9034245c9e1b18d1f3


Trivial merge