Merge remote-tracking branch 'remotes/upstream/cancelUploadOnWlanExit' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Fri, 13 Nov 2015 16:44:03 +0000 (17:44 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Fri, 13 Nov 2015 16:44:03 +0000 (17:44 +0100)
commit75b88e18b40bdb8abb6eec74027720209bee9349
tree95a0712e349e74c503f8ff05504f0816bc24f127
parent4e162ed4386f4388626b1b6387d54028e2466e1e
parent8b3ed707912a3b58346e2d617c53081fd0ff52bf
Merge remote-tracking branch 'remotes/upstream/cancelUploadOnWlanExit' into beta
src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/operations/UploadFileOperation.java