Merge commit 'a35f1c63' into eclair-mr2-plus-aosp * commit 'a35f1c63': Improvements to TimedEventQueue.