resolve merge conflicts of eb48f49dd to oc-dev am: 7e37841e4f -s ours
[platform/upstream/VK-GL-CTS.git] / android / cts / lmp /
drwxr-xr-x   ..
-rw-r--r-- 3072172 gles3-master.txt
-rw-r--r-- 1461438 gles31-master.txt
-rw-r--r-- 1307 mustpass.xml
drwxr-xr-x - src