am b78599b7: Merge change Ia67d5388 into eclair-mr2

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

* commit 'b78599b738b7a66f5bd1bed815e9cb433b2fe740':
  remote destructors are not synchronously executed by the binder...
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) {