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:25:12 +0000 (16:25 -0800)
committerPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 00:25:12 +0000 (16:25 -0800)
Change-Id: Ib5bbb55a42966027c786eeab1e5fc12defce410f


Trivial merge