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

Change-Id: I5e88dde9ee92c10ad362583ec6f709006f68fcf9


Trivial merge