merge
authorMagnus Sjoqvist <magnus.b.j.sjoqvist@gmail.com>
Tue, 11 Nov 2014 11:49:22 +0000 (12:49 +0100)
committerMagnus Sjoqvist <magnus.b.j.sjoqvist@gmail.com>
Tue, 11 Nov 2014 11:49:22 +0000 (12:49 +0100)
commit437d3315e00d072ff72e23800947abeec2a0fee2
tree26b347ade931527db04410990537c2eab70ecca7
parent0ba228c064d38b59ee17412d82259804bb8dd96f
parentc2ee5dbff97aac76fe4fce7069709ac24cdeb0db
merge
owncloud-android-library
src/com/owncloud/android/datamodel/FileDataStorageManager.java