From: Andy Scherzinger Date: Mon, 2 Nov 2015 11:29:13 +0000 (+0100) Subject: Merge branch 'target_marshmallow' of https://github.com/owncloud/android into target_... X-Git-Tag: beta-20151122~22^2~4 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/e4f85de4d69d3b03bea922eaa5eced91ee821200?hp=--cc Merge branch 'target_marshmallow' of https://github.com/owncloud/android into target_marshmallow --- e4f85de4d69d3b03bea922eaa5eced91ee821200