Merge gerrit/vulkan-cts-1.0.2 into gerrit/vulkan-cts-1.0.2-extensions
authorPyry Haulos <phaulos@google.com>
Thu, 15 Dec 2016 14:42:55 +0000 (06:42 -0800)
committerPyry Haulos <phaulos@google.com>
Thu, 15 Dec 2016 14:42:55 +0000 (06:42 -0800)
Change-Id: I867bb85cce066558b07ce6571da95305df08f784


Trivial merge