From: David A. Velasco <dvelasco@solidgear.es>
Date: Tue, 2 Jul 2013 11:08:27 +0000 (+0200)
Subject: Merge branch 'develop' into modify_password
X-Git-Tag: oc-android-1.4.3~10^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/e8239f434aeb23f598080033ec5f15e0b1971f31?hp=--cc

Merge branch 'develop' into modify_password
---

e8239f434aeb23f598080033ec5f15e0b1971f31
diff --cc src/com/owncloud/android/ui/activity/AccountSelectActivity.java
index 948c4d2b,7428f506..1a1cd51b
--- a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java
+++ b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java
@@@ -47,9 -47,8 +47,9 @@@ import com.actionbarsherlock.app.Sherlo
  import com.actionbarsherlock.view.Menu;
  import com.actionbarsherlock.view.MenuInflater;
  import com.actionbarsherlock.view.MenuItem;
- import com.owncloud.android.AccountUtils;
  import com.owncloud.android.authentication.AccountAuthenticator;
 +import com.owncloud.android.authentication.AuthenticatorActivity;
+ import com.owncloud.android.authentication.AccountUtils;
  import com.owncloud.android.Log_OC;
  
  import com.owncloud.android.R;