Merge gerrit/vulkan-cts-1.0-dev into gerrit/vulkan-cts-next-dev
authorPyry Haulos <phaulos@google.com>
Tue, 10 Jan 2017 20:21:15 +0000 (12:21 -0800)
committerPyry Haulos <phaulos@google.com>
Tue, 10 Jan 2017 20:21:15 +0000 (12:21 -0800)
Change-Id: I01010b00d0f3a98b4d4908bf0d94a824ae96ff97


Trivial merge