[SCM] Multi-format 1D/2D barcode image processing library branch, upstream, updated. 24d4480bc48cf9eabf7b2bd2f528248b0e458809

[dswitkin at google.com]

The following commit has been merged in the upstream branch:
commit a6e45c4460d5469cc31639bd706c25b289eb77be
Author: dswitkin at google.com <dswitkin at google.com@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date:   Fri Jul 16 21:10:37 2010 +0000

    Updated the version to 3.4 beta 3, and removed the reinstall target, making the install target do either.
    
    git-svn-id: http://zxing.googlecode.com/svn/trunk@1486 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index e0ec014..e7049ce 100755
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -20,8 +20,8 @@ version to be published. The next versionCode will be 7, regardless of whether t
 versionName is 2.31, 2.4, or 3.0. -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.google.zxing.client.android"
-          android:versionName="3.4 beta 2"
-          android:versionCode="56"
+          android:versionName="3.4 beta 3"
+          android:versionCode="57"
           android:installLocation="auto">
   <!-- We require Cupcake (Android 1.5) or later, but are really targeting Donut. -->
   <uses-sdk android:minSdkVersion="3"
diff --git a/android/build.xml b/android/build.xml
index fa020fc..d50f5bf 100644
--- a/android/build.xml
+++ b/android/build.xml
@@ -297,19 +297,11 @@ limitations under the License.
     <echo>Also run zipalign -f -v 4 BarcodeScanner.apk BarcodeScanner-aligned.apk after signing</echo>
   </target>
 
-  <!-- Install the package on the default emulator -->
+  <!-- Install (or reinstall) the package on the default emulator -->
   <target name="install" depends="debug">
     <echo>Installing ${out-debug-package} onto default emulator...</echo>
     <exec executable="${adb}" failonerror="true">
       <arg value="install" />
-      <arg path="${out-debug-package}" />
-    </exec>
-  </target>
-
-  <target name="reinstall" depends="debug">
-    <echo>Installing ${out-debug-package} onto default emulator...</echo>
-    <exec executable="${adb}" failonerror="true">
-      <arg value="install" />
       <arg value="-r" />
       <arg path="${out-debug-package}" />
     </exec>

-- 
Multi-format 1D/2D barcode image processing library