Merge branch 'master' of https://github.com/owncloud/android into material_buttons
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 2 Nov 2015 07:41:51 +0000 (08:41 +0100)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 2 Nov 2015 07:41:51 +0000 (08:41 +0100)
commitf72289f7bfb2aef41f575cbfe225c94e4d5fabe2
treec49ade001d0725eae8e2f96a26f2e95163cc1e9c
parent6e54dfc55ca9e02c8527db8211c12a3cb6ebe6cb
parent2f237fb0cce82a1038c103a69f6c6db4608b8df1
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/utils/DisplayUtils.java