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:19:55 +0000 (21:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Feb 2018 21:19:55 +0000 (21:19 +0000)
am: 6d6ebc1b4b

Change-Id: I504ca6591c323807e038d494db1c6b42b413d711


Trivial merge