Merge gerrit/vulkan-cts-1.0.2 into gerrit/vulkan-cts-1.0-dev
authorPyry Haulos <phaulos@google.com>
Thu, 15 Dec 2016 14:42:56 +0000 (06:42 -0800)
committerPyry Haulos <phaulos@google.com>
Thu, 15 Dec 2016 14:42:56 +0000 (06:42 -0800)
Change-Id: I92ebeef47df62646fb9fd2743991c43cd8893bda


Trivial merge