resolve merge conflicts of 3ffc2f2 to master
[platform/upstream/VK-GL-CTS.git] / android / cts / runner /
drwxr-xr-x   ..
-rw-r--r-- 733 Android.mk
drwxr-xr-x - src
drwxr-xr-x - tests