Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0-dev
authorPyry Haulos <phaulos@google.com>
Fri, 14 Oct 2016 21:06:57 +0000 (14:06 -0700)
committerPyry Haulos <phaulos@google.com>
Fri, 14 Oct 2016 21:06:57 +0000 (14:06 -0700)
Change-Id: Ia73dcdf2af13f57e6c0f52df4a4c591a35c01a2f


Trivial merge