Merge gerrit/vulkan-cts-1.0.2 into gerrit/vulkan-cts-1.0-dev
authorPyry Haulos <phaulos@google.com>
Fri, 9 Dec 2016 19:22:18 +0000 (11:22 -0800)
committerPyry Haulos <phaulos@google.com>
Fri, 9 Dec 2016 19:22:18 +0000 (11:22 -0800)
Change-Id: Id9582382bc20ce7bddeffef15884532be99364ef


Trivial merge