base

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.