Merge remote-tracking branch 'remotes/upstream/material_fab' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Thu, 29 Oct 2015 17:20:51 +0000 (18:20 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Thu, 29 Oct 2015 17:20:51 +0000 (18:20 +0100)
commita171969550de7adb4f96da9a125bc8c0a760ab3e
treed10754888dae40f61ff7f610106af9e565d242b9
parent563e6cbdad4dc183f95e18fb254e4a97efbb9a26
Merge remote-tracking branch 'remotes/upstream/material_fab' into beta

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