Merge branch 'master' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Fri, 16 Oct 2015 08:41:02 +0000 (10:41 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Fri, 16 Oct 2015 08:41:02 +0000 (10:41 +0200)
commit8586416423ccffc7d779b0bb24a3e8b26e83ea2b
tree9fca60f919930ff4d07c09e8a9c62de731e90bf7
parent13bef89333593e198dd04db9344898683d8652d8
parentbe3b6a53b938c07f593a2bd8ddfe6f72d3524117
Merge branch 'master' of https://github.com/owncloud/android into material_fab
src/com/owncloud/android/ui/activity/FileDisplayActivity.java