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

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

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