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

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