From: tobiasKaminsky <tobias@kaminsky.me>
Date: Mon, 2 Nov 2015 21:11:22 +0000 (+0100)
Subject: Merge branch 'master' of github.com:owncloud/android into setAsWallpaper
X-Git-Tag: beta-20151124~7^2~4
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c54d7e35d0efb3d1352ff6d1330cac185bef0a21

Merge branch 'master' of github.com:owncloud/android into setAsWallpaper
---

c54d7e35d0efb3d1352ff6d1330cac185bef0a21