resolve merge conflicts of ba455914 to master am: 07a7e24da3 am: 218bfe74ff
[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