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)
commit267179ef2eeb427d59be82f7ba591fbd2740014d
treec1c9ddb1dda8ba48cf9af3e60b8496690282ee34
parenta7859b4ab43cd597a745e9788c78b1cc5eb31d51
parent71f68b4c8c0cae48a885a67a4b0cd8ea145132da
Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_buttons
res/layout/file_preview.xml
src/com/owncloud/android/utils/DisplayUtils.java