Fixed merge
authorMagnus Sjoqvist <magnus.b.j.sjoqvist@gmail.com>
Fri, 10 Oct 2014 09:13:25 +0000 (11:13 +0200)
committerMagnus Sjoqvist <magnus.b.j.sjoqvist@gmail.com>
Tue, 14 Oct 2014 07:37:27 +0000 (09:37 +0200)
commitdd807540574a4202a81e5c22c9aebc9c4ddbcac5
treeb06459bd93bf83de726c993d8a1dae0369c9395e
parentebe0f73068f8934742013b65ea0674f19ac82a2d
Fixed merge
src/com/owncloud/android/ui/activity/Uploader.java