diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4ae956218..e14f2d402 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -68,7 +68,8 @@
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
          </activity>
-         <activity android:name=".VideoCallActivity" android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
+         <activity android:name=".VideoCallActivity" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+         	android:screenOrientation="nosensor">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
diff --git a/libs/armeabi-v7a/liblinphone.so b/libs/armeabi-v7a/liblinphone.so
index 418e0c751..a2f4deded 100755
Binary files a/libs/armeabi-v7a/liblinphone.so and b/libs/armeabi-v7a/liblinphone.so differ
diff --git a/libs/armeabi/liblinphone.so b/libs/armeabi/liblinphone.so
index 4a3f3bfe7..620b944a9 100755
Binary files a/libs/armeabi/liblinphone.so and b/libs/armeabi/liblinphone.so differ
diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java
index 2ba80da49..87dc646f7 100644
--- a/src/org/linphone/LinphoneService.java
+++ b/src/org/linphone/LinphoneService.java
@@ -393,7 +393,7 @@ public class LinphoneService extends Service implements LinphoneCoreListener {
 			//init network state
 			ConnectivityManager lConnectivityManager = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
 			NetworkInfo lInfo = lConnectivityManager.getActiveNetworkInfo();
-			mLinphoneCore.setNetworkStateReachable( lInfo !=null? lConnectivityManager.getActiveNetworkInfo().getState() ==NetworkInfo.State.CONNECTED:false); 
+			mLinphoneCore.setNetworkReachable( lInfo !=null? lConnectivityManager.getActiveNetworkInfo().getState() ==NetworkInfo.State.CONNECTED:false); 
 			
 		} catch (LinphoneCoreException e) {
 			throw new LinphoneConfigException(getString(R.string.wrong_settings),e);
diff --git a/src/org/linphone/NetworkManager.java b/src/org/linphone/NetworkManager.java
index faefe57cf..b5b598c75 100644
--- a/src/org/linphone/NetworkManager.java
+++ b/src/org/linphone/NetworkManager.java
@@ -40,9 +40,9 @@ public class NetworkManager extends BroadcastReceiver {
 			return;
 		}
 		if (lNoConnectivity| ((lNetworkInfo.getState() == NetworkInfo.State.DISCONNECTED) /*&& !lIsFailOver*/)) {
-			 LinphoneService.instance().getLinphoneCore().setNetworkStateReachable(false);
+			 LinphoneService.instance().getLinphoneCore().setNetworkReachable(false);
 		 } else if (lNetworkInfo.getState() == NetworkInfo.State.CONNECTED){
-			 LinphoneService.instance().getLinphoneCore().setNetworkStateReachable(true);
+			 LinphoneService.instance().getLinphoneCore().setNetworkReachable(true);
 		 } else {
 			 //unhandled event 
 		 }
diff --git a/src/org/linphone/core/AndroidVideoWindowImpl.java b/src/org/linphone/core/AndroidVideoWindowImpl.java
index ca9968e4c..9f6281bec 100644
--- a/src/org/linphone/core/AndroidVideoWindowImpl.java
+++ b/src/org/linphone/core/AndroidVideoWindowImpl.java
@@ -80,3 +80,4 @@ public class AndroidVideoWindowImpl  {
 	}
 }
 
+
diff --git a/src/org/linphone/core/LinphoneCoreImpl.java b/src/org/linphone/core/LinphoneCoreImpl.java
index f0f4dc15d..745c8c358 100644
--- a/src/org/linphone/core/LinphoneCoreImpl.java
+++ b/src/org/linphone/core/LinphoneCoreImpl.java
@@ -200,7 +200,7 @@ class LinphoneCoreImpl implements LinphoneCore {
 			throw new RuntimeException("object already destroyed");
 		}
 	}
-	public void setNetworkStateReachable(boolean isReachable) {
+	public void setNetworkReachable(boolean isReachable) {
 		setNetworkStateReachable(nativePtr,isReachable);
 	}
 	public void setPlaybackGain(float gain) {
@@ -385,9 +385,6 @@ class LinphoneCoreImpl implements LinphoneCore {
 
 		return updateCall(nativePtr, ptrCall, ptrParams);
 	}
-<<<<<<< HEAD
-	
-	
 	public void setUploadBandwidth(int bw) {
 		setUploadBandwidth(nativePtr, bw);
 	}
@@ -406,14 +403,16 @@ class LinphoneCoreImpl implements LinphoneCore {
 		VideoSize vSize = new VideoSize();
 		vSize.setWidth(nativeSize[0]);
 		vSize.setHeight(nativeSize[1]);
-
 		return vSize;
-=======
+	}
 	public void setRing(String path) {
 		setRing(nativePtr, path);
 	}
 	public String getRing() {
 		return getRing(nativePtr);
->>>>>>> c95431295dc09c5558d38c6de49fa071c957d926
+	}
+	public boolean isNetworkReachable() {
+		// TODO Auto-generated method stub
+		return false;
 	}
 }
diff --git a/submodules/linphone b/submodules/linphone
index a9db49b15..a5d821c32 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit a9db49b15aee38098d23086fd574adb99a1afda3
+Subproject commit a5d821c32ea57fa44d8cec86ca0d9b805a3b3f4a