resolve merge conflicts of eb48f49dd to oc-dev am: 7e37841e4f -s ours
[platform/upstream/VK-GL-CTS.git] / android / openglcts /
drwxr-xr-x   ..
-rw-r--r-- 4217 AndroidManifest.xml
drwxr-xr-x - src