Merge gerrit/vulkan-cts-1.0-dev into gerrit/vulkan-cts-next-dev
authorPyry Haulos <phaulos@google.com>
Fri, 2 Dec 2016 23:51:18 +0000 (15:51 -0800)
committerPyry Haulos <phaulos@google.com>
Fri, 2 Dec 2016 23:51:18 +0000 (15:51 -0800)
Change-Id: I85d04d8e037a3e9826d312d4df40df176d7735cf


Trivial merge