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)
1  2 
src/com/owncloud/android/ui/activity/FileDisplayActivity.java