Merge remote-tracking branch 'remotes/upstream/resizedImages' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Sat, 31 Oct 2015 07:36:39 +0000 (08:36 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Sat, 31 Oct 2015 07:36:39 +0000 (08:36 +0100)
commit8dfc1622bd406869a635d0e85c1c82ee1bb9ca18
tree7868dabf45832f453478d09beaf60ab3112e8463
parente6eb26a13057cdb4b5c3c67a624ebb1267111f4b
parentcf22541dd5b573030c37d2cc7624d644d33eed93
Merge remote-tracking branch 'remotes/upstream/resizedImages' into beta
src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java