From e54f52010703f8f02689c489d40c1c5e8320e488 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Mon, 14 Feb 2011 16:08:19 +0100
Subject: [PATCH] 1.1.1

---
 AndroidManifest.xml         | 2 +-
 src/org/linphone/Hacks.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index fc3b49285..228711365 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="1100" android:versionName="1.1.0"  android:installLocation="auto"> 
+      android:versionCode="1101" android:versionName="1.1.1"  android:installLocation="auto"> 
     <uses-sdk android:minSdkVersion="3" />
     <application android:label="@string/app_name" android:debuggable = "true" android:icon="@drawable/logo_linphone_57x57">
          
diff --git a/src/org/linphone/Hacks.java b/src/org/linphone/Hacks.java
index 62184c4c7..0c6809048 100644
--- a/src/org/linphone/Hacks.java
+++ b/src/org/linphone/Hacks.java
@@ -64,7 +64,8 @@ public class Hacks {
 		StringBuilder sb = new StringBuilder(" ==== Phone information dump ====\n");
 		sb.append("DEVICE=").append(Build.DEVICE).append("\n");
 		sb.append("MODEL=").append(Build.MODEL).append("\n");
-		sb.append("MANUFACTURER=").append(Build.MANUFACTURER).append("\n");
+		//MANUFACTURER doesn't exist in android 1.5.
+		//sb.append("MANUFACTURER=").append(Build.MANUFACTURER).append("\n");
 		sb.append("SDK=").append(Build.VERSION.SDK);
 		
 		Log.d("Linphone", sb.toString());