From: tobiasKaminsky <tobias@kaminsky.me>
Date: Wed, 2 Dec 2015 19:25:40 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/material_fab' into beta
X-Git-Tag: beta-20151202~3
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/2eecb46250300a470fa20caee27b2b04a1e0ea49?hp=-c

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

2eecb46250300a470fa20caee27b2b04a1e0ea49