resolve merge conflicts of cc5cabd to nyc-mr1-dev am: 7a338a6626 am: b64869c70f am...
[platform/upstream/VK-GL-CTS.git] / android / cts /
drwxr-xr-x   ..
-rw-r--r-- 1286 Android.mk
-rw-r--r-- 7770 AndroidTest.xml
drwxr-xr-x - lmp-mr1
drwxr-xr-x - lmp
drwxr-xr-x - master
drwxr-xr-x - mnc
drwxr-xr-x - nyc
drwxr-xr-x - runner