Merge remote-tracking branch 'remotes/upstream/video_thumbnail' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Sun, 1 Nov 2015 08:14:09 +0000 (09:14 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Sun, 1 Nov 2015 08:14:09 +0000 (09:14 +0100)
commitec83a9f100897cf93df8aba990ab348ddfaaf05e
tree68be5ba2b7f30184ccede366e7c6de94c7726804
parent465ff1b7b8b04132f58fdea80cdf12ce9a2e01fd
parent366ec0b4723d6735fed5ed3e7dab6f1b7a0a4a61
Merge remote-tracking branch 'remotes/upstream/video_thumbnail' into beta
CHANGELOG.md
src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java