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

[srowen]

The following commit has been merged in the upstream branch:
commit 972111d7a79de1cc313376fdeebd72f39242cfa6
Author: srowen <srowen at 59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date:   Tue Mar 30 16:28:44 2010 +0000

    'Blacklist' Geeksphone as they don't seem to report expected camera params
    
    git-svn-id: http://zxing.googlecode.com/svn/trunk@1264 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/android/src/com/google/zxing/client/android/HelpActivity.java b/android/src/com/google/zxing/client/android/HelpActivity.java
index a02c5e5..d10d4d0 100644
--- a/android/src/com/google/zxing/client/android/HelpActivity.java
+++ b/android/src/com/google/zxing/client/android/HelpActivity.java
@@ -39,7 +39,7 @@ public final class HelpActivity extends Activity {
 
   private static final String TAG = HelpActivity.class.getName();
 
-  private static final String[] BUGGY_MODEL_SUBSTRINGS = {"Behold II", "Pulse"};
+  private static final String[] BUGGY_MODEL_SUBSTRINGS = {"Behold II", "Pulse", "Geeksphone"};
   private static final Uri BUGGY_URI =
       Uri.parse("http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions");
 

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