Merge remote-tracking branch 'remotes/upstream/video_thumbnail' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Wed, 2 Dec 2015 19:29:03 +0000 (20:29 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Wed, 2 Dec 2015 19:29:03 +0000 (20:29 +0100)
commit4246701891d4f6e412e98bbba25be1c50b4e3e23
tree8b3032008100434d675a5e3698477f97afaa3260
parentdeb1e48fc01a9750cc55429ff290e6f6ac025bf4
parente9bf119fa40ab59e44e712fc4e0bf49478683fb8
Merge remote-tracking branch 'remotes/upstream/video_thumbnail' into beta
src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java