resolve merge conflicts of b81edb4 to master am: ce5292f584 am: 49ddc6319b
[platform/upstream/VK-GL-CTS.git] / android /
drwxr-xr-x   ..
-rw-r--r-- 132 .gitignore
drwxr-xr-x - cts
drwxr-xr-x - package
drwxr-xr-x - res_src
drwxr-xr-x - scripts