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

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