From 0598e2eb78141dd2520bfa942e22cf26455a19cb Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Fri, 14 Aug 2015 09:55:47 +0200
Subject: [PATCH] Updated version 2.5

---
 AndroidManifest.xml | 2 +-
 ant.properties      | 2 +-
 submodules/linphone | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4bda42092..571337975 100644
--- a/AndroidManifest.xml
+++ b/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="2411" android:installLocation="auto">
+      android:versionCode="2500" android:installLocation="auto">
     <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="22"/>
     
     <!-- Permissions for Push Notification -->
diff --git a/ant.properties b/ant.properties
index d2cc146d1..41ee35579 100644
--- a/ant.properties
+++ b/ant.properties
@@ -1,4 +1,4 @@
 source.dir=src:submodules/linphone/mediastreamer2/java/src:submodules/linphone/java/j2se:submodules/linphone/java/common:submodules/linphone/java/impl:submodules/linphone/coreapi/help/java:submodules/externals/axmlrpc/src/main/java
 key.store=bc-android.keystore
 key.alias=nw8000
-version.name=2.4.0
+version.name=2.5.0
diff --git a/submodules/linphone b/submodules/linphone
index 075f13f23..e369f0e28 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 075f13f233c21caec79ca0e3ed3796f0e0082e4f
+Subproject commit e369f0e284337f6a369a160ae92a714a1684a227