am 82e037a4: Merge change I3f67758f into eclair

Merge commit '82e037a4ed8ef38a4ca45e0058cf179111f1e98f' into eclair-plus-aosp

* commit '82e037a4ed8ef38a4ca45e0058cf179111f1e98f':
  doc change: remove existing (unchanged since sdk) samples from zip. This now contains only new samples.
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) {