Merge "Merge upstream-vulkan-cts-1.0-dev into master"
authorPyry Haulos <phaulos@google.com>
Tue, 9 Aug 2016 21:39:11 +0000 (21:39 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 9 Aug 2016 21:39:11 +0000 (21:39 +0000)

Trivial merge