commit 8fee03b1f0e2b47004c7ab8e373b15340f47309b
author Jim Miller <jaggies@google.com> Fri Jan 29 18:06:48 2010 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Jan 29 18:06:48 2010 -0800
tree f4d901d22f470e7d421cde73033da6a191f7db17
parent 89f164ff7c21348f368e6cc290c248cf0219ea57
parent f2d703adf00d32e8dcc0e4fd71439c501912daea

am d8a3a895: Fix 2404771: Expose reset() in SlidingTab widget so we can reset it when we get an incoming call.

Merge commit 'd8a3a8957b9d71ab75584b0cc98324fd70cc527c' into eclair-plus-aosp

* commit 'd8a3a8957b9d71ab75584b0cc98324fd70cc527c':
  Fix 2404771: Expose reset() in SlidingTab widget so we can reset it when we get an incoming call.

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) {