diff --git a/LinphoneCoreImpl.java b/LinphoneCoreImpl.java
index 532a7ae2c..f0f4dc15d 100644
--- a/LinphoneCoreImpl.java
+++ b/LinphoneCoreImpl.java
@@ -85,6 +85,9 @@ class LinphoneCoreImpl implements LinphoneCore {
 	private native void setDownloadBandwidth(long nativePtr, int bw);
 	private native void setPreferredVideoSize(long nativePtr, int width, int heigth);
 	private native int[] getPreferredVideoSize(long nativePtr);
+
+	private native void setRing(long nativePtr, String path);
+	private native String getRing(long nativePtr);
 	
 	private static String TAG = "LinphoneCore"; 
 	
@@ -382,6 +385,7 @@ class LinphoneCoreImpl implements LinphoneCore {
 
 		return updateCall(nativePtr, ptrCall, ptrParams);
 	}
+<<<<<<< HEAD
 	
 	
 	public void setUploadBandwidth(int bw) {
@@ -404,5 +408,12 @@ class LinphoneCoreImpl implements LinphoneCore {
 		vSize.setHeight(nativeSize[1]);
 
 		return vSize;
+=======
+	public void setRing(String path) {
+		setRing(nativePtr, path);
+	}
+	public String getRing() {
+		return getRing(nativePtr);
+>>>>>>> c95431295dc09c5558d38c6de49fa071c957d926
 	}
 }
diff --git a/LinphoneProxyConfigImpl.java b/LinphoneProxyConfigImpl.java
index 7ffb164b2..f1dcb70a4 100644
--- a/LinphoneProxyConfigImpl.java
+++ b/LinphoneProxyConfigImpl.java
@@ -18,9 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 package org.linphone.core;
 
-import org.linphone.LinphoneService;
-
-import android.util.Log;
 
 
 
@@ -35,7 +32,6 @@ class LinphoneProxyConfigImpl implements LinphoneProxyConfig {
 		setProxy(proxy);
 		enableRegister(enableRegister);
 		ownPtr=true;
-		Log.w(LinphoneService.TAG, "route ["+route+"] not used yet");
 	}
 	protected LinphoneProxyConfigImpl(long aNativePtr)  {
 		nativePtr = aNativePtr;
diff --git a/tutorials/TutorialBuddyStatusActivity.java b/tutorials/TutorialBuddyStatusActivity.java
index 376afadfb..d42607d16 100644
--- a/tutorials/TutorialBuddyStatusActivity.java
+++ b/tutorials/TutorialBuddyStatusActivity.java
@@ -36,7 +36,7 @@ import android.widget.TextView;
  */
 public class TutorialBuddyStatusActivity extends Activity {
 
-	private static final String defaultSipAddress = "sip:tested@10.0.2.6:5059";
+	private static final String defaultSipAddress = "sip:";
 	private TextView sipAddressWidget;
 	private TutorialBuddyStatus tutorial;
 	private Handler mHandler =  new Handler() ;
diff --git a/tutorials/TutorialChatRoomActivity.java b/tutorials/TutorialChatRoomActivity.java
index aa4623eeb..f7dab4ce7 100644
--- a/tutorials/TutorialChatRoomActivity.java
+++ b/tutorials/TutorialChatRoomActivity.java
@@ -36,7 +36,7 @@ import android.widget.TextView;
  */
 public class TutorialChatRoomActivity extends Activity {
 
-	private static final String defaultSipAddress = "sip:tested@10.0.2.6:5059";
+	private static final String defaultSipAddress = "sip:";
 	private TextView sipAddressWidget;
 	private TutorialChatRoom tutorial;
 	private Handler mHandler =  new Handler() ;
diff --git a/tutorials/TutorialHelloWorldActivity.java b/tutorials/TutorialHelloWorldActivity.java
index 3ef643a61..60bd872c7 100644
--- a/tutorials/TutorialHelloWorldActivity.java
+++ b/tutorials/TutorialHelloWorldActivity.java
@@ -36,7 +36,7 @@ import android.widget.TextView;
  */
 public class TutorialHelloWorldActivity extends Activity {
 
-	private static final String defaultSipAddress = "sip:tested@10.0.2.6:5059";
+	private static final String defaultSipAddress = "sip:";
 	private TextView sipAddressWidget;
 	private TutorialHelloWorld tutorial;
 	private Handler mHandler =  new Handler() ;
diff --git a/tutorials/TutorialRegistrationActivity.java b/tutorials/TutorialRegistrationActivity.java
index 4da10f632..d87446140 100644
--- a/tutorials/TutorialRegistrationActivity.java
+++ b/tutorials/TutorialRegistrationActivity.java
@@ -35,8 +35,8 @@ import android.widget.TextView;
  */
 public class TutorialRegistrationActivity extends TutorialHelloWorldActivity {
 
-	private static final String defaultSipAddress = "sip:8182449901ip@mty11.axtel.net";
-	private static final String defaultSipPassword = "49901";
+	private static final String defaultSipAddress = "sip:";
+	private static final String defaultSipPassword = "";
 	private TextView sipAddressWidget;
 	private TextView sipPasswordWidget;
 	private TutorialRegistration tutorial;