commit 65c1cbfaa1533ed5a81fa6b106e67a819345bfab
author Jim Miller <jaggies@google.com> Fri Jan 22 20:23:37 2010 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Jan 22 20:23:37 2010 -0800
tree f4d901d22f470e7d421cde73033da6a191f7db17
parent c11cc12776f142cb5e3902530970f1e1833e2fa4
parent 4691ef5e0f0c48a4246b10d0f37c5ad21955ace9

am 2e4e25f3: Merge "Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long." into eclair

Merge commit '2e4e25f39ea6488ddc2b5427ec4a66edc1f8facc' into eclair-plus-aosp

* commit '2e4e25f39ea6488ddc2b5427ec4a66edc1f8facc':
  Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long.

opengl/libagl/egl.cpp

diff --git a/opengl/libagl/egl.cpp b/opengl/libagl/egl.cpp
index 781b8c3..81864bd 100644
--- a/opengl/libagl/egl.cpp
+++ b/opengl/libagl/egl.cpp
@@ -1205,7 +1205,7 @@
                 gConfigManagement,
                 0, NELEM(gConfigManagement)-1,
                 attr);
-        if (index >= 0) {
+        if (cfgMgtIndex >= 0) {
             bool match = gConfigManagement[cfgMgtIndex].match(
                     val, configFound[index].value);
             if (match) {