From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Mon, 17 Aug 2015 14:04:17 +0000 (+0200)
Subject: Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_... 
X-Git-Tag: beta-20151128~7^2~45
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/b669bd77374750484eb4b67e38899b643210e35b?hp=--cc

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

b669bd77374750484eb4b67e38899b643210e35b