Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorPyry Haulos <phaulos@google.com>
Fri, 12 May 2017 18:05:20 +0000 (11:05 -0700)
committerPyry Haulos <phaulos@google.com>
Fri, 12 May 2017 18:05:20 +0000 (11:05 -0700)
commitd08f2167220cb7566241e472ac0f2ee1c29b2e58
tree30ac856f643b93d6dc7c4af614e0b84a860e8af0
parent62a097c39b5d6777a8bb255ea4c2219eb7df0be2
parent1c01725c02d4b7c9f4cb29e985d8a7ac9089402f
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: Ib5a98bc9b3c1781a6d4a6ca5eaabe74aee42badf