commit 2c52eecb2add80d02f43aa98ad6f1950d2b4968a
author Eric Fischer <enf@google.com> Tue Nov 17 17:59:09 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 17 17:59:09 2009 -0800
tree 6164c16a6158066e40e9dff21a183bd28f662d14
parent 16ba214042dd660b1c0dc00d2ae682008c2fa734
parent 1777ae191dba0a2788c16b5ef9e5ce9f76f6da16

am e45ebbaf: am 04a0e969: Merge change Id7c432bf into eclair

Merge commit 'e45ebbaf1b4450bb65fa13aaa3e64243ab838435' into eclair-mr2-plus-aosp

* commit 'e45ebbaf1b4450bb65fa13aaa3e64243ab838435':
  Add vertical bar to the alt-space character picker for the hardware keyboard.

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