resolve merge conflicts of cc5cabd to nyc-mr1-dev am: 7a338a6626
[platform/upstream/VK-GL-CTS.git] / data / gles2 /
drwxr-xr-x   ..
drwxr-xr-x - data
drwxr-xr-x - shaders