Merge branch 334-resolve-image-tests into vulkan-cts-1.0-dev
authorPyry Haulos <phaulos@google.com>
Mon, 13 Jun 2016 17:07:18 +0000 (10:07 -0700)
committerPyry Haulos <phaulos@google.com>
Mon, 13 Jun 2016 17:07:18 +0000 (10:07 -0700)

Trivial merge