Merge branch 'master' of github.com:owncloud/android into setAsWallpaper
authortobiasKaminsky <tobias@kaminsky.me>
Mon, 2 Nov 2015 21:11:22 +0000 (22:11 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Mon, 2 Nov 2015 21:11:22 +0000 (22:11 +0100)

Trivial merge