Merge branch 'master' of git.linphone.org:linphone-android

Conflicts:
	src/org/linphone/DialerActivity.java

AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.linphone"
-      android:versionCode="1016" android:versionName="1.0.16"  android:installLocation="auto"> 
+      android:versionCode="1100" android:versionName="1.1.0"  android:installLocation="auto"> 
     <uses-sdk android:minSdkVersion="3" />
     <application android:label="@string/app_name" android:debuggable = "true" android:icon="@drawable/logo_linphone_57x57">
          

src/org/linphone/DialerActivity.java

@@ -39,7 +39,6 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.media.AudioManager;
 import android.media.MediaPlayer;
-import android.media.RingtoneManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.PowerManager;
@@ -225,7 +224,6 @@ public class DialerActivity extends Activity implements LinphoneCoreListener {
 				// so disabling it totally
 				mSpeaker.setVisibility(View.GONE);
 			}
-			
 			mInCallControlRow.setVisibility(View.GONE);
 			mInCallAddressLayout.setVisibility(View.GONE);
 			mDecline.setEnabled(false);
@@ -553,6 +551,7 @@ public class DialerActivity extends Activity implements LinphoneCoreListener {
 		} else {
 			mAudioManager.setSpeakerphoneOn(true); 
 		}
+		
 	}
 	private void routeAudioToReceiver() {
 		if (Integer.parseInt(Build.VERSION.SDK) <=4 /*<donut*/) {

submodules/linphone

@@ -1 +1 @@
-Subproject commit 1534f84c60132dcf5c7126417afc0388c15aba2c
+Subproject commit 6ed021b4be9d333d13e70c688ce8b0f02c9ecf2a