From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Thu, 17 Sep 2015 14:58:54 +0000 (+0200)
Subject: Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
X-Git-Tag: beta-20151202~3^2~39
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/820055cb241555ccede25121a6324e68d4ea3536?hp=--cc

Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
---

820055cb241555ccede25121a6324e68d4ea3536