From: tobiasKaminsky <tobias@kaminsky.me>
Date: Mon, 2 Nov 2015 08:43:58 +0000 (+0100)
Subject: Merge branch 'setAsWallpaper' into beta
X-Git-Tag: beta-20151122~45^2~7
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/932c00f4f15bc0f3b37ecedf02d9e3092730531f?hp=932c00f4f15bc0f3b37ecedf02d9e3092730531f

Merge branch 'setAsWallpaper' into beta

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