Merge remote-tracking branch 'remotes/upstream/resizedImages' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Sat, 21 Nov 2015 08:50:57 +0000 (09:50 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Sat, 21 Nov 2015 08:50:57 +0000 (09:50 +0100)
commitc3217b323a606cd629a5ae4321698e6cc83eb4de
tree5e78771aa9545226c8695b31a93a19a9adee1ee7
parentc00d952cdc41342723ba4b124708fe4493baf4b1
parent90382c588901caec07f5b3fc8be50ea16c0027d6
Merge remote-tracking branch 'remotes/upstream/resizedImages' into beta
src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
src/com/owncloud/android/ui/preview/PreviewImageFragment.java