From 4439394089dc5e21c7c84bb0c4d7db7901b0e559 Mon Sep 17 00:00:00 2001
From: Margaux Clerc <margaux.clerc@belledonne-communications.com>
Date: Fri, 18 Sep 2015 18:24:35 +0200
Subject: [PATCH] Fix merge with AndroidManifest

---
 AndroidManifest.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 80f026f80..b11c4b091 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.linphone"
       android:versionCode="2510" android:installLocation="auto">
-    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="22"/>
+    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="22"/>
    
     <!-- Permissions for Push Notification -->
     <permission android:name="org.linphone.permission.C2D_MESSAGE" android:protectionLevel="signature" /> <!-- Change package ! -->
@@ -100,10 +100,10 @@
          </activity>
 
 		<activity android:name="org.linphone.OutgoingCallActivity"
-				  android:theme="@style/NoTitle"
-				  android:noHistory="true"
-				  android:launchMode="singleTop"
-				  android:screenOrientation="behind">
+			  android:theme="@style/NoTitle"
+			  android:noHistory="true"
+			  android:launchMode="singleTop"
+			  android:screenOrientation="behind">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
 			</intent-filter>