From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Thu, 13 Aug 2015 13:57:38 +0000 (+0200)
Subject: Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_... 
X-Git-Tag: beta-20151128~7^2~65
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/af2af7198b3919fb476e78d252e28216bb643d82?ds=inline;hp=af2af7198b3919fb476e78d252e28216bb643d82

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

Conflicts:
	res/layout/ssl_untrusted_cert_layout.xml
	res/layout/ssl_validator_layout.xml
---