resolve merge conflicts of eb48f49dd to oc-dev am: 7e37841e4f -s ours
[platform/upstream/VK-GL-CTS.git] / data / gles31 / shaders /
drwxr-xr-x   ..
drwxr-xr-x - es31
drwxr-xr-x - es32