From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Tue, 4 Aug 2015 10:49:28 +0000 (+0200)
Subject: Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar
X-Git-Tag: oc-android-1.8~42^2~44
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/3e87ca193dd87bb3377441967a70ea9903d802ff?ds=inline;hp=-c

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

Conflicts:
	build.gradle
---

3e87ca193dd87bb3377441967a70ea9903d802ff