Merge branch 'master' of https://github.com/owncloud/android into material_buttons
authorAndy Scherzinger <info@andy-scherzinger.de>
Fri, 4 Sep 2015 11:16:11 +0000 (13:16 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Fri, 4 Sep 2015 11:16:11 +0000 (13:16 +0200)
commit32145d57dbbdde6163664ddfcd8c28b10b134503
tree76605b5d73ecc64c8ff19da0734b7628469af58f
parentd24b396d54ffd926c18cfb13687de3164ca80bc5
parentf787213cd1cae854c169d263d3636e1de4dffa94
Merge branch 'master' of https://github.com/owncloud/android into material_buttons

Conflicts:
res/layout/uploader_layout.xml
res/layout/uploader_layout.xml
src/com/owncloud/android/ui/activity/FileActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java