Merge remote-tracking branch 'remotes/upstream/setAsWallpaper' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Sat, 21 Nov 2015 09:03:07 +0000 (10:03 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Sat, 21 Nov 2015 09:03:07 +0000 (10:03 +0100)
commitb47cd012d2c66d9d84808a702c2f928c4fb07e8a
tree114af0cba4cad9ede896049dbc7e15b233c4d445
parent5fcf9932137d30fd8cf85b4271fd74f6f1e11b3c
parent8b451ab992db65a2a897f37e2a77b89aa767a66d
Merge remote-tracking branch 'remotes/upstream/setAsWallpaper' into beta
res/values/strings.xml
src/com/owncloud/android/files/FileOperationsHelper.java