From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sat, 21 Nov 2015 08:35:19 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/avoidDuplicateFiles' into beta
X-Git-Tag: beta-20151122~4
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/45e95d494dca25b857d15d384d6d0e1d4cbf2899

Merge remote-tracking branch 'remotes/upstream/avoidDuplicateFiles' into beta
---

45e95d494dca25b857d15d384d6d0e1d4cbf2899
diff --cc owncloud-android-library
index 4f9a7528,b09969d0..ecc3415e
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 4f9a7528cab0563cb234a8b817e8ee371dd6cc25
 -Subproject commit b09969d078b3a790b01c8d61a7298a37439a9f24
++Subproject commit ecc3415e3e3c13fa8f73fdd51a88c1ab7087b199