tree 86a7b58f3c10d3309a2a22f242da1e3c1da23ca5
parent cd11e8cddff6b512839625b7f0c660323afcb504
parent 2bf0f1a3c153c432faa050479a8d8b4259d4999f
author Fred Quintana <fredq@google.com> 1272489919 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1272489919 -0700

am 2bf0f1a3: am 00b92b94: 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