diff options
| author | Andreas Huber <andih@google.com> | 2010-04-12 14:23:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-12 14:23:31 -0700 |
| commit | c6a57ec8c1984a22032f3e74c3b8bce44d47ecb9 (patch) | |
| tree | c4333b1d19b4dea3beb4fd5c98a3afcd88572544 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 6ed060d915ed0f65814f77cdfac19a465122c22d (diff) | |
| parent | c6f8d526cc4e107a7ea51ef9f06fb593c2e8f019 (diff) | |
am 98c5bd55: am 6dbf80d0: Merge "Fix a race condition in TimedEventQueue, an event may be cancelled while we\'re waiting for its scheduled time to come in which case we\'d be removing it from the queue twice." into froyo
Merge commit '98c5bd5556f32a237d3483fb7298284869e32a40' into kraken
* commit '98c5bd5556f32a237d3483fb7298284869e32a40':
Fix a race condition in TimedEventQueue, an event may be cancelled while we're waiting for its scheduled time to come in which case we'd be removing it from the queue twice.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions