resolve merge conflicts of e5f7483 to master am: c4598ea31b am: 8e2e181bd6 am: cd63b8bc85
[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