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

Change-Id: I20e71e276fbfad48b810694e59e8131ff4dc733b


Trivial merge