resolve merge conflicts of 433645782 to oc-dev-plus-aosp
[platform/upstream/VK-GL-CTS.git] / targets / nullws /
drwxr-xr-x   ..
-rw-r--r-- 1488 nullws.cmake