resolve merge conflicts of cfeb3c0 to nyc-dev am: 518f489214 am: a6eacd8101
[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