Merge branch 'uploadWhenCharging' of github.com:owncloud/android into uploadWhenCharging
authortobiasKaminsky <tobias@kaminsky.me>
Sun, 18 Oct 2015 08:08:46 +0000 (10:08 +0200)
committertobiasKaminsky <tobias@kaminsky.me>
Sun, 18 Oct 2015 08:08:46 +0000 (10:08 +0200)

No differences found