resolve merge conflicts of 04c959c to nyc-dev-plus-aosp am: 921c48e50a am: eeb08c7a18
[platform/upstream/VK-GL-CTS.git] / doc / qpa_file_format.txt
2014-09-10 Jarkko PoyryImport dEQP.