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

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

Conflicts:
	res/layout-land/account_setup.xml
	res/layout/account_setup.xml
---