Merge gerrit/vulkan-cts-1.0-dev into gerrit/vulkan-cts-next-dev
authorPyry Haulos <phaulos@google.com>
Thu, 5 Jan 2017 17:58:18 +0000 (09:58 -0800)
committerPyry Haulos <phaulos@google.com>
Thu, 5 Jan 2017 17:58:18 +0000 (09:58 -0800)
Change-Id: Ia7a0ff45e1e45e2878f1a8028fa1c560739d276e


Trivial merge