From: Andy Scherzinger Date: Fri, 27 Nov 2015 20:40:01 +0000 (+0100) Subject: Merge branch 'master' of https://github.com/owncloud/android into target_marshmallow X-Git-Tag: beta-20151129~2^2~1^2~1 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/4d47f348c3cac7095ee341b8b33aac4ae3cc5320 Merge branch 'master' of https://github.com/owncloud/android into target_marshmallow --- 4d47f348c3cac7095ee341b8b33aac4ae3cc5320