Merge branch 'setAsWallpaper' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Mon, 2 Nov 2015 08:38:24 +0000 (09:38 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Mon, 2 Nov 2015 08:38:24 +0000 (09:38 +0100)
commitfdf892fed3acab6f994a6393ad9426595b97c625
tree3d03511b4eca0abf9fcb915ace58a69a18425794
parent12dbd25ac9691faebd909322e9fa4662fa5cc1f8
parent597d5640bb97e2594bedecbcbbc16c5ebc4bb6d6
Merge branch 'setAsWallpaper' into beta
res/menu/file_actions_menu.xml
res/values/strings.xml
src/com/owncloud/android/files/FileOperationsHelper.java
src/com/owncloud/android/ui/preview/PreviewImageFragment.java