Merge gerrit/vulkan-cts-1.0.2 into gerrit/vulkan-cts-1.0-dev
authorPyry Haulos <phaulos@google.com>
Tue, 10 Jan 2017 20:21:14 +0000 (12:21 -0800)
committerPyry Haulos <phaulos@google.com>
Tue, 10 Jan 2017 20:21:14 +0000 (12:21 -0800)
Change-Id: I104cae5b8ad882dbead6e15b6cf6514b8b9f48cd


Trivial merge