From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Tue, 10 Nov 2015 10:27:23 +0000 (+0100)
Subject: Merge branch '1193_uploader_layout' of https://github.com/owncloud/android into beta
X-Git-Tag: beta-20151122~19^2~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/bc472ee32b28e047fa07b7921a46fe572647712e?ds=inline;hp=bc472ee32b28e047fa07b7921a46fe572647712e

Merge branch '1193_uploader_layout' of https://github.com/owncloud/android into beta

Conflicts:
	res/layout/uploader_layout.xml
	res/layout/uploader_list_item_layout.xml
	src/com/owncloud/android/ui/activity/Uploader.java
---