Merge branch 'fix_file_list_icon_alignment' of github.com:owncloud/android into fix_f...
authormasensio <masensio@solidgear.es>
Wed, 16 Sep 2015 09:44:51 +0000 (11:44 +0200)
committermasensio <masensio@solidgear.es>
Wed, 16 Sep 2015 09:44:51 +0000 (11:44 +0200)

Trivial merge