Merge branch 'new_filetype_icons' of https://github.com/owncloud/android into materia...
authorAndy Scherzinger <info@andy-scherzinger.de>
Fri, 11 Sep 2015 11:06:14 +0000 (13:06 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Fri, 11 Sep 2015 11:06:14 +0000 (13:06 +0200)
commit6eccdc25b3e4ac9bb9c5686aa3e53f60ce07b59d
tree44aa6a3c034775eae6b11933c8171bf967dad4a2
parent13a73dd56872b6fcbc12ab8c62806cbfd48dc93b
parentb1aff427156f28323f11b7fc1f2eba94326b118e
Merge branch 'new_filetype_icons' of https://github.com/owncloud/android into material_buttons

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