From: tobiasKaminsky <tobias@kaminsky.me>
Date: Wed, 5 Nov 2014 20:45:08 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/develop' into rotateImage
X-Git-Tag: oc-android-1.7.0_signed~81^2~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c105861d0fa27912a19a85f39fed7950de5a3d9a?ds=inline;hp=--cc

Merge remote-tracking branch 'upstream/develop' into rotateImage

Conflicts:
	src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
---

c105861d0fa27912a19a85f39fed7950de5a3d9a
diff --cc src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
index 54727775,1d2cda8c..ce53c444
--- a/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
+++ b/src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
@@@ -20,17 -20,20 +20,22 @@@ package com.owncloud.android.datamodel
  import java.io.File;
  import java.lang.ref.WeakReference;
  
+ import org.apache.commons.httpclient.HttpStatus;
+ import org.apache.commons.httpclient.methods.GetMethod;
+ 
+ import android.accounts.Account;
+ import android.accounts.AccountManager;
  import android.content.res.Resources;
  import android.graphics.Bitmap;
+ import android.graphics.Bitmap.CompressFormat;
  import android.graphics.BitmapFactory;
 +import android.graphics.Matrix;
- import android.graphics.Bitmap.CompressFormat;
  import android.graphics.drawable.BitmapDrawable;
  import android.graphics.drawable.Drawable;
 +import android.media.ExifInterface;
  import android.media.ThumbnailUtils;
+ import android.net.Uri;
  import android.os.AsyncTask;
- import android.util.TypedValue;
  import android.widget.ImageView;
  
  import com.owncloud.android.MainApp;