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

Change-Id: Ia988e82808c4048e351196cd86a15235b2402b6c


Trivial merge