am a35f1c63: Merge change Ib64ea2dd into eclair-mr2

Merge commit 'a35f1c63a67df0832d9b3f1aed3e2376367d4398' into eclair-mr2-plus-aosp

* commit 'a35f1c63a67df0832d9b3f1aed3e2376367d4398':
  Improvements to TimedEventQueue.