From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Thu, 20 Aug 2015 09:39:54 +0000 (+0200)
Subject: Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
X-Git-Tag: beta-20151202~3^2~67
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/efce517f5ef69ac5a0d7741cdd38188895b41683

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

efce517f5ef69ac5a0d7741cdd38188895b41683