resolve merge conflicts of cc5cabd to nyc-mr1-dev am: 7a338a6626 am: b64869c70f am...
[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