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

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

172767d391b36e1eba6d7c19556b34156007298c