Merge gerrit/vulkan-cts-1.0-dev into gerrit/vulkan-cts-next-dev
authorPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 00:43:23 +0000 (16:43 -0800)
committerPyry Haulos <phaulos@google.com>
Wed, 4 Jan 2017 00:43:23 +0000 (16:43 -0800)
commit6cc31fa2e0fc8a0d0d0886107f14dfc95c9e45f7
treeccf8f0e8b51ac93c64bef5d00825a98209ec580d
parentdd63f75c66797e43325f9b2fd0e993b91f78e844
parent83b847f6876a66e673e3de4fda3d4d03f424643b
Merge gerrit/vulkan-cts-1.0-dev into gerrit/vulkan-cts-next-dev

Change-Id: I44b7973e4fdce506ec9d2cb2a488d06fab916865