From: jabarros <jabarros@solidgear.es>
Date: Wed, 15 Oct 2014 10:20:49 +0000 (+0200)
Subject: Merge branch 'idn_hosts' of https://github.com/ogasser/android into idn_hosts
X-Git-Tag: oc-android-1.7.0_signed~128^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/2910b006735fc7848bd7f357458332a542871bb8?ds=inline

Merge branch 'idn_hosts' of https://github.com/ogasser/android into idn_hosts

Conflicts:
	src/com/owncloud/android/authentication/AuthenticatorActivity.java
---

2910b006735fc7848bd7f357458332a542871bb8
diff --cc src/com/owncloud/android/authentication/AuthenticatorActivity.java
index d88b8dc2,9569a532..ee38c4b5
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@@ -85,6 -84,8 +85,7 @@@ import com.owncloud.android.ui.dialog.I
  import com.owncloud.android.ui.dialog.SamlWebViewDialog;
  import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;
  import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener;
+ import com.owncloud.android.utils.DisplayUtils;
 -import com.owncloud.android.utils.Log_OC;
  
  /**
   * This Activity is used to add an ownCloud account to the App