41aabeb513
Merge commit '1e6a3a53fc4d56e3a0f86c8721dedfd46e738a32' into gingerbread-plus-aosp * commit '1e6a3a53fc4d56e3a0f86c8721dedfd46e738a32': Added more robust tracking and cancelation of events.