resolve merge conflicts of 9b726ab8 to master am: 02473c7876
[platform/upstream/VK-GL-CTS.git] / android / res_src /
2014-09-10 Jarkko PoyryImport dEQP.