Merge gerrit/vulkan-cts-1.0.2-extensions into gerrit/vulkan-cts-next-dev
authorPyry Haulos <phaulos@google.com>
Fri, 9 Dec 2016 19:22:19 +0000 (11:22 -0800)
committerPyry Haulos <phaulos@google.com>
Fri, 9 Dec 2016 19:22:19 +0000 (11:22 -0800)
Change-Id: Iea0578983d84f2db3bbbe4c49dcd0b4e6e81f1c5


Trivial merge