Merge branch 'download_folder__refactoring_observance_of_downloads_in_progress' into...
authorjabarros <jabarros@solidgear.es>
Tue, 20 Jan 2015 11:42:27 +0000 (12:42 +0100)
committerjabarros <jabarros@solidgear.es>
Tue, 20 Jan 2015 11:42:27 +0000 (12:42 +0100)
commitd8ac7b2241bc99df58b5f4be4c3c4d83fc9efaf6
tree9012fe6b9ccdab970519586790aa87047599e80f
parent05c236ba628b92972ccf7cc0f3c765d04f577b28
parentd2883905c637467f46964abaf7dd199f47f6fba9
Merge branch 'download_folder__refactoring_observance_of_downloads_in_progress' into download_folder_update_database
src/com/owncloud/android/datamodel/OCFile.java
src/com/owncloud/android/files/services/FileDownloader.java