Merge remote-tracking branch 'remotes/upstream/resizeCache' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Thu, 29 Oct 2015 17:37:28 +0000 (18:37 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Thu, 29 Oct 2015 17:37:28 +0000 (18:37 +0100)
commitf1113a67c5a683e546518d0f964067f59f50ab28
treee84c0d5558e869855b7e920b803ec7ad1cdfce56
parenta8df1430c3666119cde2c1d445d49cd32559aa3f
parent890b8df3743539d86024b780d4705394efd8d05e
Merge remote-tracking branch 'remotes/upstream/resizeCache' into beta
CHANGELOG.md
res/values/strings.xml
res/xml/preferences.xml
src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
src/com/owncloud/android/ui/activity/Preferences.java
src/com/owncloud/android/ui/adapter/DiskLruImageCache.java