Merge remote-tracking branch 'remotes/upstream/resizeCache' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Sun, 29 Nov 2015 13:37:17 +0000 (14:37 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Sun, 29 Nov 2015 13:37:17 +0000 (14:37 +0100)
commitb9f8b0941a8f3af54ad511c9c199663cccf5eced
treef6f2c7464874b407a3825f49abe27a3c07f0ce23
parent7e893e6ecbe15b28274a468d5b605f70176f174c
parent5c9c34f1d2554034bd7cd839121446b7d6f6c9f0
Merge remote-tracking branch 'remotes/upstream/resizeCache' into beta
src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
src/com/owncloud/android/ui/activity/Preferences.java