Merge remote-tracking branch 'remotes/upstream/resizedImages' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Mon, 26 Oct 2015 21:49:00 +0000 (22:49 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Mon, 26 Oct 2015 21:49:00 +0000 (22:49 +0100)
commitd44c785d0727b71ab696d5a6216f00cf135867c6
treea98097ae24388a9eee29ed2a5026d3f5e2abc008
parent7b780553be6b386d226b5b22e08291f0cbcfb931
parent788ebbcdabfde85592bb2d26edb90e5a5e644a3e
Merge remote-tracking branch 'remotes/upstream/resizedImages' into beta
AndroidManifest.xml
owncloud-android-library
src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
src/com/owncloud/android/files/FileOperationsHelper.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/com/owncloud/android/ui/preview/PreviewImageActivity.java
src/com/owncloud/android/ui/preview/PreviewImageFragment.java