Merge remote-tracking branch 'remotes/upstream/switchListVsGrid' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Fri, 13 Nov 2015 16:42:02 +0000 (17:42 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Fri, 13 Nov 2015 16:42:02 +0000 (17:42 +0100)
commitd67b1990b2e31749eac83c37301847256fd4f6cf
tree0d765b019c2a9e1f22e4404b54aeb6a396510f1c
parent423b208d68690f482c735f16ad73f721506e7c8b
parent4fc29cf6a036452f9ae5dca1bf849cd8267d5700
Merge remote-tracking branch 'remotes/upstream/switchListVsGrid' into beta
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
src/com/owncloud/android/ui/preview/PreviewTextFragment.java