am d1019a99: Merge "DO NOT MERGE" into eclair

Merge commit 'd1019a99f9b458a4129e047c96de7192a61e5e99' into eclair-plus-aosp

* commit 'd1019a99f9b458a4129e047c96de7192a61e5e99':
  DO NOT MERGE
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) {