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)
commit7fe9c02bffe53c3a8a40ee68e1a5c4c713c9d899
treeaf762d11e3d75c1a33da6c14a564dd74d93faba4
parent37df675ca3b8275293dfdfcd1b166ebcf831232f
parent9364edbb117eec6cd4de90266ffff3101aceef8d
Merge branch 'uploadWhenCharging' of github.com:owncloud/android into uploadWhenCharging
res/xml/preferences.xml
src/com/owncloud/android/ui/activity/Preferences.java