Merge branch 'beta' of github.com:owncloud/android into beta
authortobiasKaminsky <tobias@kaminsky.me>
Fri, 13 Nov 2015 16:52:18 +0000 (17:52 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Fri, 13 Nov 2015 16:52:18 +0000 (17:52 +0100)
commit420051123c0d61b987f9427c2531b544dd2f68c0
tree80ba90e8bb9c1c5944f24ff1b669007026bacb03
parent62f34c8fd5899a9ecc9115371abb3a35fb4b4245
parent7a3caaff9e7327edcb1f4298747c70f367dfcd9d
Merge branch 'beta' of github.com:owncloud/android into beta
src/com/owncloud/android/ui/activity/Uploader.java