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


Trivial merge