diff options
| author | Mathias Agopian <mathias@google.com> | 2009-10-30 15:01:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-30 15:01:57 -0700 |
| commit | 144fb0bbdfb3812e9cb0ef8d0c58f32e794793a8 (patch) | |
| tree | 4a6f5e0b5d55450ca8d980f31ce87b45b0fff025 /opengl | |
| parent | 5d0024b39bd7ce702a7a19476086195af1e63b41 (diff) | |
| parent | bd5a0027f4fbffc8cada0d22e8ccebf680cdc749 (diff) | |
| download | frameworks_native-144fb0bbdfb3812e9cb0ef8d0c58f32e794793a8.zip frameworks_native-144fb0bbdfb3812e9cb0ef8d0c58f32e794793a8.tar.gz frameworks_native-144fb0bbdfb3812e9cb0ef8d0c58f32e794793a8.tar.bz2 | |
am d01767f8: Merge change I56779290 into eclair
Merge commit 'd01767f8b7038108f9125cd2122b117db9919824' into eclair-mr2
* commit 'd01767f8b7038108f9125cd2122b117db9919824':
fix[2222341] Soft reset while going back from camcorder settings
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libs/EGL/egl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/opengl/libs/EGL/egl.cpp b/opengl/libs/EGL/egl.cpp index 5efecb0..c22c21b 100644 --- a/opengl/libs/EGL/egl.cpp +++ b/opengl/libs/EGL/egl.cpp @@ -1677,7 +1677,7 @@ EGLImageKHR eglCreateImageKHR(EGLDisplay dpy, EGLContext ctx, EGLenum target, } else { // In case of success, we need to clear all error flags // (especially those caused by the implementation that didn't - // succeed). TODO: we could about this if we knew this was + // succeed). TODO: we could avoid this if we knew this was // a "full" success (all implementation succeeded). eglGetError(); } |