Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_...
authorAndy Scherzinger <info@andy-scherzinger.de>
Fri, 14 Aug 2015 16:55:58 +0000 (18:55 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Fri, 14 Aug 2015 16:55:58 +0000 (18:55 +0200)
1  2 
res/layout/file_preview.xml
src/com/owncloud/android/utils/DisplayUtils.java

Simple merge