resolve merge conflicts of cc5cabd to nyc-mr1-dev am: 7a338a6626 am: b64869c70f am...
[platform/upstream/VK-GL-CTS.git] / android / cts / runner / tests /
drwxr-xr-x   ..
-rw-r--r-- 982 Android.mk
-rwxr-xr-x 1673 run_tests.sh
drwxr-xr-x - src