From: masensio <masensio@solidgear.es>
Date: Thu, 13 Mar 2014 14:49:17 +0000 (+0100)
Subject: Merge branch 'pr/400' into improve_notifications_pr_400_with_develop
X-Git-Tag: oc-android-1.5.5~5^2~4^2~7
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/9b2e4a6063e95090b32eea5c4a9d6f73d1187cf1?ds=inline;hp=--cc

Merge branch 'pr/400' into improve_notifications_pr_400_with_develop
---

9b2e4a6063e95090b32eea5c4a9d6f73d1187cf1
diff --cc src/com/owncloud/android/syncadapter/FileSyncAdapter.java
index 4f1cd68a,59e7754c..a3394e61
--- a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
+++ b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
@@@ -35,13 -36,11 +35,10 @@@ import com.owncloud.android.operations.
  import com.owncloud.android.operations.UpdateOCVersionOperation;
  import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
  import com.owncloud.android.ui.activity.ErrorsWhileCopyingHandlerActivity;
- import com.owncloud.android.utils.DisplayUtils;
  import com.owncloud.android.utils.Log_OC;
  
- 
  import android.accounts.Account;
 -import android.accounts.AccountManager;
  import android.accounts.AccountsException;
- import android.app.Notification;
  import android.app.NotificationManager;
  import android.app.PendingIntent;
  import android.content.AbstractThreadedSyncAdapter;