Merge gerrit/vulkan-cts-1.0-dev into gerrit/vulkan-cts-next-dev
authorPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 00:43:23 +0000 (16:43 -0800)
committerPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 00:43:23 +0000 (16:43 -0800)
Change-Id: I44b7973e4fdce506ec9d2cb2a488d06fab916865


Trivial merge