am 8ccfd36d: am 1e64e52c: Merge "Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we\'re waiting for its scheduled time. Avoids potential int64_t overflow when converting from us to ns." into

Merge commit '8ccfd36d3d6aae7be33dcf0c19646762298306ad' into kraken

* commit '8ccfd36d3d6aae7be33dcf0c19646762298306ad':
  Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we're waiting for its scheduled time. Avoids potential int64_t overflow when converting from us to ns.
This commit is contained in:
Andreas Huber 2010-03-29 13:06:11 -07:00 committed by Android Git Automerger
commit 40d1cbad0e

Diff Content Not Available