commit b28efde63809543cfb0162abfea1df2bb1ec5c05
author The Android Automerger <android-build@android.com> Tue Oct 16 17:30:45 2012 -0700
committer The Android Automerger <android-build@android.com> Tue Oct 16 17:30:45 2012 -0700
tree 60914d0fb65b4143321183c66d5821e7457c607b
parent 825a9a2dcd1b3e139dd0677ff46f966fb23f963c
parent af49b5e2c79728996e37a4e682be860330c18edc

merge in jb-mr1-release history after reset to jb-mr1-dev

opengl/libs/EGL/eglApi.cpp

diff --git a/opengl/libs/EGL/eglApi.cpp b/opengl/libs/EGL/eglApi.cpp
index c352401..23e89da 100644
--- a/opengl/libs/EGL/eglApi.cpp
+++ b/opengl/libs/EGL/eglApi.cpp
@@ -213,12 +213,12 @@
                 EGLint attrib = attrib_list[0];
 
                 // Only enable MSAA if the context is OpenGL ES 2.0 and
-                // if a depth buffer is requested
+                // if no caveat is requested
                 const EGLint *attribRendererable = NULL;
                 const EGLint *attribCaveat = NULL;
 
                 // Count the number of attributes and look for
-                // EGL_RENDERABLE_TYPE and ELG_DEPTH_SIZE
+                // EGL_RENDERABLE_TYPE and EGL_CONFIG_CAVEAT
                 while (attrib != EGL_NONE) {
                     attrib = attrib_list[attribCount];
                     switch (attrib) {