Merge remote-tracking branch 'remotes/upstream/externalSD2' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Fri, 20 Nov 2015 17:32:55 +0000 (18:32 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Fri, 20 Nov 2015 17:32:55 +0000 (18:32 +0100)
commite35e32ad52f3964a44f0f404adf699e0d18502de
tree8031cc5e072d236b529892b0647a8f55838d6797
parente52df4a59e244f9665c06211f43c5a1628348f0b
parent18801deac414c45ecc98f9c8a6c20b066fc4fce9
Merge remote-tracking branch 'remotes/upstream/externalSD2' into beta
AndroidManifest.xml
owncloud-android-library
res/values-hu-rHU/strings.xml
res/values/strings.xml
res/xml/preferences.xml
src/com/owncloud/android/MainApp.java
src/com/owncloud/android/datamodel/FileDataStorageManager.java
src/com/owncloud/android/ui/activity/Preferences.java
src/com/owncloud/android/ui/activity/UploadFilesActivity.java
src/com/owncloud/android/utils/FileStorageUtils.java