OC-1701: Conflict detected in keep-in-sync
[pub/Android/ownCloud.git] / third_party / android-support-library /
drwxr-xr-x   ..
-rw-r--r-- 349252 android-support-v4.jar