From: Andy Scherzinger Date: Tue, 15 Sep 2015 16:44:49 +0000 (+0200) Subject: Merge branch 'new_filetype_icons' of https://github.com/owncloud/android into materia... X-Git-Tag: beta-20151128~7^2~28 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/9e15d2459d4280666e2fbc99d67326f680bf392b?ds=inline;hp=--cc Merge branch 'new_filetype_icons' of https://github.com/owncloud/android into material_buttons --- 9e15d2459d4280666e2fbc99d67326f680bf392b