commit 98c5bd5556f32a237d3483fb7298284869e32a40
author Andreas Huber <andih@google.com> Mon Apr 12 14:19:23 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Apr 12 14:19:23 2010 -0700
tree a7e61b698c26ae2a184dd0d6e329d7668acbc0f9
parent 5b0fb521e6af1ca61141daa3d86f97fd6343f5e4
parent 6dbf80d086d03d95c5f6331719edd6dd6dac0361

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 '6dbf80d086d03d95c5f6331719edd6dd6dac0361' into froyo-plus-aosp

* commit '6dbf80d086d03d95c5f6331719edd6dd6dac0361':
  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.