am 9aaf24f2: Merge "revert a change in the SyncManager that caused it to not...
am 9aaf24f2: Merge "revert a change in the SyncManager that caused it to not cancel long running syncs if the next sync had the same account and authority." into froyo
Merge commit '9aaf24f2' into froyo-plus-aosp
* commit '9aaf24f2':
revert a change in the SyncManager that caused it to not cancel