resolve merge conflicts of 8afe1d6 to nyc-dev-plus-aosp
[platform/upstream/VK-GL-CTS.git] / data / gles2 /
drwxr-xr-x   ..
drwxr-xr-x - data
drwxr-xr-x - shaders