Merge remote-tracking branch 'remotes/upstream/master' into sortAccents
authortobiasKaminsky <tobias@kaminsky.me>
Fri, 2 Oct 2015 14:04:18 +0000 (16:04 +0200)
committertobiasKaminsky <tobias@kaminsky.me>
Fri, 2 Oct 2015 14:04:18 +0000 (16:04 +0200)
commit7579d3daf7dd2135877b1029d0576fa2cb60aaaa
tree6bdb8e24382406cf7e2d2ee9d75bf331e014e2d6
parentd1c18cac1299c3488098d983422ee1c6780293b5
parent8090269d557590a6d50f184006abef6c9bb7d399
Merge remote-tracking branch 'remotes/upstream/master' into sortAccents
src/com/owncloud/android/utils/FileStorageUtils.java