Merge branch 'new_filetype_icons' of https://github.com/owncloud/android into materia...
authorAndy Scherzinger <info@andy-scherzinger.de>
Fri, 11 Sep 2015 11:03:09 +0000 (13:03 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Fri, 11 Sep 2015 11:03:09 +0000 (13:03 +0200)
commit7336a391ae64593cc923178c32e061eeff1958da
treefe14157bd947dfa0f54b530283042d7c0459ddd8
parentbee2bdff630dbe62e83481f931e4d5b6b5b81571
parentb1aff427156f28323f11b7fc1f2eba94326b118e
Merge branch 'new_filetype_icons' of https://github.com/owncloud/android into material_fab

Conflicts:
src/com/owncloud/android/utils/DisplayUtils.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
src/com/owncloud/android/utils/DisplayUtils.java