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

[vikrama]

The following commit has been merged in the upstream branch:
commit 3ec199d52cca4d24137a2be1531a321e7cd36b61
Author: vikrama <vikrama at 59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date:   Wed Jun 23 03:01:43 2010 +0000

    Do not broadcast the intent
    
    git-svn-id: http://zxing.googlecode.com/svn/trunk@1453 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 4772a2f..a59471c 100755
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -99,10 +99,11 @@ versionName is 2.31, 2.4, or 3.0. -->
               android:label="@string/wa_name"
               android:screenOrientation="landscape"
               android:configChanges="orientation|keyboardHidden">
-      <intent-filter>
-        <action android:name="com.google.zxing.client.android.WIFI_CONNECT"/>
-        <category android:name="android.intent.category.DEFAULT"/>
-      </intent-filter>
+<!--Do not broadcast this intent-->
+<!--      <intent-filter>-->
+<!--        <action android:name="com.google.zxing.client.android.WIFI_CONNECT"/>-->
+<!--        <category android:name="android.intent.category.DEFAULT"/>-->
+<!--      </intent-filter>-->
     </activity>
     <activity android:name=".share.ShareActivity"
               android:label="@string/share_name"

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