Merge gerrit/vulkan-cts-1.0.2 into gerrit/vulkan-cts-1.0.2-extensions
authorPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 00:43:21 +0000 (16:43 -0800)
committerPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 00:43:21 +0000 (16:43 -0800)
Change-Id: I55f0c1c8c5d49a41bfb2977418d70c8e940a5fbf


Trivial merge