From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Wed, 19 Aug 2015 17:18:29 +0000 (+0200)
Subject: Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
X-Git-Tag: beta-20151202~3^2~68
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/6ce558c0333a4763ae11f57549a0a3925a209cf8

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

6ce558c0333a4763ae11f57549a0a3925a209cf8