resolve merge conflicts of 433645782 to oc-dev-plus-aosp
[platform/upstream/VK-GL-CTS.git] / framework / common / tcuImageIO.hpp
2014-09-10 Jarkko PoyryImport dEQP.