Merge gerrit/vulkan-cts-1.0.2 into gerrit/vulkan-cts-1.0.2-extensions
authorPyry Haulos <phaulos@google.com>
Tue, 10 Jan 2017 20:21:13 +0000 (12:21 -0800)
committerPyry Haulos <phaulos@google.com>
Tue, 10 Jan 2017 20:21:13 +0000 (12:21 -0800)
commit1d5a9062dc8fee3d5d29f1c4f6cce4f55e01b7c7
tree99739f63aec2577166d18137f787369c3600875a
parentd38a5b032b8936cfef4282caff40b6ed72349139
parent9cf974b0f6bc3970ffad052cbf2340758d5c7d8b
Merge gerrit/vulkan-cts-1.0.2 into gerrit/vulkan-cts-1.0.2-extensions

Change-Id: I03ac764c0248a7df434ff871abded41b1b03823e