From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Thu, 6 Aug 2015 15:23:02 +0000 (+0200)
Subject: Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar
X-Git-Tag: oc-android-1.8~42^2~27
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/9d9efd1c1ded9c225c16be80f4b648018839f3ef

Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar

Conflicts:
	owncloud-android-library
---

9d9efd1c1ded9c225c16be80f4b648018839f3ef
diff --cc src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
index aef1de1d,601ec4fd..9b7050e8
--- a/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
+++ b/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
@@@ -22,10 -22,8 +22,11 @@@
  
  package com.owncloud.android.ui.activity;
  
 +import android.content.Intent;
 +import android.os.Bundle;
 +
  import com.owncloud.android.datamodel.OCFile;
+ import com.owncloud.android.files.services.FileDownloader;
  import com.owncloud.android.files.services.FileUploader;
  import com.owncloud.android.lib.common.utils.Log_OC;
  import com.owncloud.android.ui.dialog.ConflictsResolveDialog;