From: tobiasKaminsky <tobias@kaminsky.me>
Date: Thu, 29 Oct 2015 17:25:53 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/material_fab' into beta
X-Git-Tag: beta-20151122~89
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/bfe9127dbe9e33453e379d7466d4b0650663a9fb?hp=bfe9127dbe9e33453e379d7466d4b0650663a9fb

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

# Conflicts:
#	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
---