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

Change-Id: I9c06845a7be2bbf33d4cc71c62a3097c488fb266


Trivial merge