From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Wed, 16 Sep 2015 14:31:10 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/owncloud/android into material_fab
X-Git-Tag: beta-20151202~3^2~44
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/932963d8584cf5391b46f769f86620cee3489ddf?hp=--cc

Merge branch 'master' of https://github.com/owncloud/android into material_fab

Conflicts:
	res/layout/list_item.xml
---

932963d8584cf5391b46f769f86620cee3489ddf
diff --cc owncloud-android-library
index ecc3415e,ecc3415e..17bb724b
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@@ -1,1 -1,1 +1,1 @@@
--Subproject commit ecc3415e3e3c13fa8f73fdd51a88c1ab7087b199
++Subproject commit 17bb724b4207142d631a5f1c70d1e80c447e2310