Merge gerrit/vulkan-cts-1.0-dev into gerrit/vulkan-cts-next-dev
authorPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 00:25:14 +0000 (16:25 -0800)
committerPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 00:25:14 +0000 (16:25 -0800)
Change-Id: I40540e22d21e86dc27fbd63eee65f240ba4c3289


Trivial merge