Merge remote-tracking branch 'upstream/develop' into uploadWhenCharging
authortobiasKaminsky <tobias@kaminsky.me>
Wed, 22 Jul 2015 18:15:14 +0000 (20:15 +0200)
committertobiasKaminsky <tobias@kaminsky.me>
Wed, 22 Jul 2015 18:15:14 +0000 (20:15 +0200)
commit8c92889fa18178521c8b140ba3ba43df186e54e5
tree0aaa7c43b028b106d411d96135e7c9355edda437
parente0e6512974b771720ebe41bf88f84b74d539e6ed
parentff82b51e49f40155e7c340090f5ee759af2bf3ad
Merge remote-tracking branch 'upstream/develop' into uploadWhenCharging
AndroidManifest.xml
res/values/strings.xml
res/xml/preferences.xml
src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java