resolve merge conflicts of 037808f59 to oc-mr1-dev
[platform/upstream/VK-GL-CTS.git] / android / package /
drwxr-xr-x   ..
-rw-r--r-- 1344 Android.mk
-rw-r--r-- 2395 AndroidManifest.xml
drwxr-xr-x - res
drwxr-xr-x - src