resolve merge conflicts of 8afe1d6 to nyc-dev-plus-aosp am: 0d151184d5 am: f47f5ecf0b
[platform/upstream/VK-GL-CTS.git] / android /
drwxr-xr-x   ..
-rw-r--r-- 132 .gitignore
drwxr-xr-x - cts
drwxr-xr-x - openglcts
drwxr-xr-x - package
drwxr-xr-x - res_src