Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0.2
authorPyry Haulos <phaulos@google.com>
Fri, 6 Jan 2017 20:44:56 +0000 (12:44 -0800)
committerPyry Haulos <phaulos@google.com>
Fri, 6 Jan 2017 20:44:56 +0000 (12:44 -0800)
Change-Id: Ic1b09c684e6535fcaba6e4d7dd407b2fbbe40b6d


Trivial merge