resolve merge conflicts of b81edb4 to master am: ce5292f584 am: 49ddc6319b am: f07ca0...
[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