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)
commitc54d7e35d0efb3d1352ff6d1330cac185bef0a21
tree4d356a4b2ef57e737922679cec26d54d7a84e59d
parente192084434669c86fcbd880685646ec81b4bfc0b
parent2f237fb0cce82a1038c103a69f6c6db4608b8df1
Merge branch 'master' of github.com:owncloud/android into setAsWallpaper