Merge commit '9aaf24f2a46eacd1e342f8c0300c3093646e2814' into froyo-plus-aosp * commit '9aaf24f2a46eacd1e342f8c0300c3093646e2814': revert a change in the SyncManager that caused it to not cancel
Merge commit '9aaf24f2a46eacd1e342f8c0300c3093646e2814' into froyo-plus-aosp * commit '9aaf24f2a46eacd1e342f8c0300c3093646e2814': revert a change in the SyncManager that caused it to not cancel