Merge branch 'text_file_preview_pr_707_with_develop' of github.com:owncloud/android...
authormasensio <masensio@solidgear.es>
Wed, 2 Sep 2015 11:29:14 +0000 (13:29 +0200)
committermasensio <masensio@solidgear.es>
Wed, 2 Sep 2015 11:29:14 +0000 (13:29 +0200)
commit6b84d83b3544f8de4e56186f6ecbccd3d612702b
tree3610d37a710594fef1ccfe698a995e2bf0b02396
parenta0707428ff3f82f28261afc1cdc3061b534f47e2
parentae0e116ffc620bb9c5c94f1a9a24a5500e89bd8f
Merge branch 'text_file_preview_pr_707_with_develop' of github.com:owncloud/android into text_file_preview_pr_707_with_develop
src/com/owncloud/android/datamodel/OCFile.java