resolve merge conflicts of cc5cabd to nyc-mr1-dev am: 7a338a6626 am: b64869c70f am...
[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