tree 39dd3fdf0488417c873dff2181eccab9c3e0818a
parent 725f731cb9368f52a0c6664d2961ef4340c8f7a0
parent 9aaf24f2a46eacd1e342f8c0300c3093646e2814
author Fred Quintana <fredq@google.com> 1272489235 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1272489235 -0700

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 '9aaf24f2a46eacd1e342f8c0300c3093646e2814' into froyo-plus-aosp

* commit '9aaf24f2a46eacd1e342f8c0300c3093646e2814':
  revert a change in the SyncManager that caused it to not cancel