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)
commit932c00f4f15bc0f3b37ecedf02d9e3092730531f
treefec1e1f7f31db1441fe2632e049fc57033d5f64f
parentfdf892fed3acab6f994a6393ad9426595b97c625
Merge branch 'setAsWallpaper' into beta

# Conflicts:
# res/values/strings.xml
# src/com/owncloud/android/files/FileOperationsHelper.java
src/com/owncloud/android/ui/preview/PreviewImageFragment.java