resolve merge conflicts of b172f9e to master am: ed8e08ff82 am: 657bfbfb71 am: 29baf2...
[platform/upstream/VK-GL-CTS.git] / LICENSE
2014-09-10 Jarkko PoyryImport dEQP.