resolve merge conflicts of b6d3261 to nyc-mr1-dev-plus-aosp am: ed852bf557 am: 900673646e
[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