resolve merge conflicts of b172f9e to master am: ed8e08ff82 am: 657bfbfb71 am: 29baf2...
[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