Merge branch 'setAsWallpaper' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Mon, 2 Nov 2015 08:43:58 +0000 (09:43 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Mon, 2 Nov 2015 08:43:58 +0000 (09:43 +0100)
# Conflicts:
# res/values/strings.xml
# src/com/owncloud/android/files/FileOperationsHelper.java


No differences found