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


Trivial merge