From: tobiasKaminsky <tobias@kaminsky.me>
Date: Fri, 13 Nov 2015 16:45:04 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/target_marshmallow' into beta
X-Git-Tag: beta-20151122~22
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/af2841eea2eb1240e6b6b95eab797d0cc24fcaa5?hp=-c

Merge remote-tracking branch 'remotes/upstream/target_marshmallow' into beta
---

af2841eea2eb1240e6b6b95eab797d0cc24fcaa5