From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Fri, 11 Sep 2015 11:06:14 +0000 (+0200)
Subject: Merge branch 'new_filetype_icons' of https://github.com/owncloud/android into materia... 
X-Git-Tag: beta-20151128~7^2~30
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/6eccdc25b3e4ac9bb9c5686aa3e53f60ce07b59d?hp=6eccdc25b3e4ac9bb9c5686aa3e53f60ce07b59d

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

Conflicts:
	src/com/owncloud/android/utils/DisplayUtils.java
---