Merge branch 'new_filetype_icons' of https://github.com/owncloud/android into materia...
authorAndy Scherzinger <info@andy-scherzinger.de>
Tue, 15 Sep 2015 16:44:49 +0000 (18:44 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Tue, 15 Sep 2015 16:44:49 +0000 (18:44 +0200)

Trivial merge