Merge branch 'master' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 7 Sep 2015 09:13:04 +0000 (11:13 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 7 Sep 2015 09:13:04 +0000 (11:13 +0200)
commitd039bffbd171b95c6db2eff4b39c42fc731ca895
treee4edc4d383b3b3b0fee8fc81813a8d4375bb7497
parentb4151dacf26018376f84fc3eaa55406000e0fd8b
parent22f0f59991d07b806fb01b010c6a37e6cb7ae312
Merge branch 'master' of https://github.com/owncloud/android into material_fab
res/layout/file_preview.xml
src/com/owncloud/android/ui/activity/FileDisplayActivity.java