Merge gerrit/vulkan-cts-1.0-dev into gerrit/vulkan-cts-next-dev
authorPyry Haulos <phaulos@google.com>
Thu, 17 Nov 2016 14:58:59 +0000 (06:58 -0800)
committerPyry Haulos <phaulos@google.com>
Thu, 17 Nov 2016 14:58:59 +0000 (06:58 -0800)
Change-Id: I723f43f02d259745569818e671fbd84b3ed37202


Trivial merge