resolve merge conflicts of 037808f59 to oc-dr1-dev-plus-aosp
[platform/upstream/VK-GL-CTS.git] / data / gles2 /
drwxr-xr-x   ..
drwxr-xr-x - data
drwxr-xr-x - shaders