Merge branch 'master' of https://github.com/owncloud/android into material_buttons
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 7 Sep 2015 09:16:29 +0000 (11:16 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 7 Sep 2015 09:16:29 +0000 (11:16 +0200)
commit6d670fb6786ade61eea01af32c7ccdbd09992bc9
treea82c021de58d99fbeedc3aa60a5eceb7eca5309b
parentc1e73ec56f341a26d480c5ffe231d871bee1a86d
parent22f0f59991d07b806fb01b010c6a37e6cb7ae312
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
res/layout/file_preview.xml
src/com/owncloud/android/ui/activity/FileDisplayActivity.java