From: jabarros <jabarros@solidgear.es>
Date: Mon, 19 Jan 2015 11:49:28 +0000 (+0100)
Subject: Merge branch 'develop' into download_folder
X-Git-Tag: oc-android-1.7.0_signed~23^2~11
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/e98fc8b141fed66cbdd265aaebd2cfa3affb68ac?ds=sidebyside

Merge branch 'develop' into download_folder
---

e98fc8b141fed66cbdd265aaebd2cfa3affb68ac
diff --cc src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 850d03b8,9c8c8e1f..0e3e0377
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@@ -44,10 -44,8 +44,9 @@@ import com.owncloud.android.authenticat
  import com.owncloud.android.datamodel.FileDataStorageManager;
  import com.owncloud.android.datamodel.OCFile;
  import com.owncloud.android.datamodel.ThumbnailsCacheManager;
- import com.owncloud.android.datamodel.ThumbnailsCacheManager.AsyncDrawable;
  import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
  import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
 +import com.owncloud.android.services.OperationsService.OperationsServiceBinder;
  import com.owncloud.android.ui.activity.ComponentsGetter;
  import com.owncloud.android.utils.DisplayUtils;
  import com.owncloud.android.utils.FileStorageUtils;