From 84607564681aaa04da27a32e04f8a1b010d7f939 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Mon, 30 Aug 2010 17:52:28 +0200
Subject: [PATCH] Backed out changeset e051ccf2361a

---
 embedding/android/AndroidManifest.xml.in | 2 +-
 embedding/android/Makefile.in            | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/embedding/android/AndroidManifest.xml.in b/embedding/android/AndroidManifest.xml.in
index c22599bf967..2719fdafab2 100644
--- a/embedding/android/AndroidManifest.xml.in
+++ b/embedding/android/AndroidManifest.xml.in
@@ -4,7 +4,7 @@
       package="org.mozilla.@MOZ_APP_NAME@"
       android:installLocation="auto"
       android:versionCode="1"
-      android:versionName=@MOZ_APP_VERSION@
+      android:versionName="@MOZ_APP_VERSION@"
       android:sharedUserId="org.mozilla.sharedID">
     <uses-sdk android:minSdkVersion="5"
               android:targetSdkVersion="5"/>
diff --git a/embedding/android/Makefile.in b/embedding/android/Makefile.in
index a352a44806c..22de3bfcc74 100644
--- a/embedding/android/Makefile.in
+++ b/embedding/android/Makefile.in
@@ -54,6 +54,7 @@ JAVAFILES = \
 DEFINES += \
   -DMOZ_APP_DISPLAYNAME=$(MOZ_APP_DISPLAYNAME) \
   -DMOZ_APP_NAME=$(MOZ_APP_NAME) \
+  -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
   -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)
 
 GARBAGE += \