Merge remote-tracking branch 'origin/master' into text_file_preview_pr_707_with_develop
authormasensio <masensio@solidgear.es>
Wed, 2 Sep 2015 11:21:17 +0000 (13:21 +0200)
committermasensio <masensio@solidgear.es>
Wed, 2 Sep 2015 11:23:42 +0000 (13:23 +0200)
commita0707428ff3f82f28261afc1cdc3061b534f47e2
treef032af5911c3ec315068e21d93211fb197ef3fb9
parentfafc422ca40bfbc590211245bcfb77734f23ac20
parentf626b136340578c29a52abbe247b5d10cf90b50f
Merge remote-tracking branch 'origin/master' into text_file_preview_pr_707_with_develop

Conflicts:
res/layout/file_preview.xml
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
res/layout/file_preview.xml
src/com/owncloud/android/datamodel/OCFile.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java