Merge remote-tracking branch 'upstream/develop' into resizedImages
authortobiasKaminsky <tobias@kaminsky.me>
Wed, 1 Jul 2015 17:16:42 +0000 (19:16 +0200)
committertobiasKaminsky <tobias@kaminsky.me>
Wed, 1 Jul 2015 17:16:42 +0000 (19:16 +0200)
commitce35d6448e39f06d66596b23dc7e3ddf1e93ab5a
tree4a3f819c6b08ca7e6dae52d9f98be4261b418571
parenta1bc147849ecef3fba9f9cfd9cdba037e762d14d
parent93b6c374005e6a78b355cf788794c834041a6e9a
Merge remote-tracking branch 'upstream/develop' into resizedImages
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
src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java