Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0-dev
authorPyry Haulos <phaulos@google.com>
Fri, 2 Dec 2016 22:26:30 +0000 (14:26 -0800)
committerPyry Haulos <phaulos@google.com>
Fri, 2 Dec 2016 22:26:30 +0000 (14:26 -0800)
Change-Id: Ida8369e7d121c8282069fd3a70a64efb4490bddd


Trivial merge