commit 297ee6aae65b468d51297cb22eca71c52e5cb6ab
author Ray Chen <raychen@google.com> Fri Dec 04 12:02:04 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Dec 04 12:02:04 2009 -0800
tree 6e9452eff68fc124b6919a2302cc5ad9d64d8785
parent 2da1dcb82b6e3099e52ca66f6fc1fc6dc038cb12
parent ac28190e34353e7e321d91be7fe1a40471ae27a7

am 8a576620: am 052d9c8b: Images.Media.DATE_TAKEN should be in milliseconds. http://b/2297371

Merge commit '8a576620cdc7257fc026026c77f7c946bfb760d1' into eclair-mr2-plus-aosp

* commit '8a576620cdc7257fc026026c77f7c946bfb760d1':
  Images.Media.DATE_TAKEN should be in milliseconds.

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