am 41aabeb5: am 1e6a3a53: Merge "Added more robust tracking and cancelation of...
am 41aabeb5: am 1e6a3a53: Merge "Added more robust tracking and cancelation of events." into gingerbread
Merge commit '41aabeb5'
* commit '41aabeb5':
Added more robust tracking and cancelation of events.