resolve merge conflicts of b6d3261 to nyc-mr1-dev-plus-aosp am: ed852bf557 am: 900673646e
[platform/upstream/VK-GL-CTS.git] / data /
drwxr-xr-x   ..
drwxr-xr-x - gles2
drwxr-xr-x - gles3
drwxr-xr-x - gles31
drwxr-xr-x - internal