Merge branch 'download_folder' into download_folder_cancel_downloads
authorjabarros <jabarros@solidgear.es>
Tue, 16 Dec 2014 14:04:39 +0000 (15:04 +0100)
committerjabarros <jabarros@solidgear.es>
Tue, 16 Dec 2014 14:04:39 +0000 (15:04 +0100)
commit98929a9c8ff9d64936e728d3d660af242269773d
tree32a7e137a1880adeba8e34ec9a69616317cdbafe
parentf22693cd4ee36495865505590f0d8430b59c4e00
parenta4277dcd37f778166c431c785aaa7e9d445210c2
Merge branch 'download_folder' into download_folder_cancel_downloads
src/com/owncloud/android/services/OperationsService.java