From 475edaafcd5b8949a7104752ecb37718c20f9550 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 29 Jan 2018 11:54:40 +0100
Subject: [PATCH] Updated linphone + changed conf factory uri

---
 AndroidManifest.xml        | 4 ++--
 res/raw/linphonerc_factory | 2 +-
 submodules/linphone        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9a3af8aca..6c2a653d1 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest package="org.linphone"
           xmlns:android="http://schemas.android.com/apk/res/android"
           android:installLocation="auto"
-          android:versionCode="3321"
-          android:versionName="3.3.2-gc">
+          android:versionCode="3322"
+          android:versionName="3.3.2-gc-2">
 
     <uses-sdk
         android:minSdkVersion="16"
diff --git a/res/raw/linphonerc_factory b/res/raw/linphonerc_factory
index 28ba3f14b..afd83f19b 100644
--- a/res/raw/linphonerc_factory
+++ b/res/raw/linphonerc_factory
@@ -36,7 +36,7 @@ dtmf_player_amp=0.1
 ec_calibrator_cool_tones=1
 
 [misc]
-conference_factory_uri=sip:conference-factory@conf.linphone.org
+conference_factory_uri=sip:conference-factory@sip.linphone.org
 max_calls=10
 history_max_size=100
 
diff --git a/submodules/linphone b/submodules/linphone
index acd77eba5..e49f2fedd 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit acd77eba5f92e94efd974f9fc8dce4d6aa818627
+Subproject commit e49f2fedda05681e0c9d168c046652465fb452fb