Merge remote-tracking branch 'remotes/upstream/material_fab' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Thu, 29 Oct 2015 17:25:53 +0000 (18:25 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Thu, 29 Oct 2015 17:25:53 +0000 (18:25 +0100)
commitbfe9127dbe9e33453e379d7466d4b0650663a9fb
treea4bcc9b91ffb96b59aaeca3ca3ed195ce9ca0191
parentb23d07d8a134acf8a7632db6287376452739359f
Merge remote-tracking branch 'remotes/upstream/material_fab' into beta

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