Merge gerrit/vulkan-cts-1.0.2 into gerrit/vulkan-cts-1.0.2-extensions
authorPyry Haulos <phaulos@google.com>
Thu, 5 Jan 2017 17:58:16 +0000 (09:58 -0800)
committerPyry Haulos <phaulos@google.com>
Thu, 5 Jan 2017 17:58:16 +0000 (09:58 -0800)
Change-Id: I3f1dee7da1908243688e90bb6e2c577d62b0bae3


Trivial merge