From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Wed, 9 Sep 2015 09:43:02 +0000 (+0200)
Subject: Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
X-Git-Tag: beta-20151202~3^2~55
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/fb2ba72d43c3a73d44aaf78a30521898d1770629?hp=-c

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

fb2ba72d43c3a73d44aaf78a30521898d1770629