tree 8318e41c8e69bdb5ea75e955c07b4bb967898e66
parent bc5a03286a72dc3627cee313d473178f5a123049
parent 12664a7a4d0a17c4c4db33374550f7ff19593be7
author Fred Quintana <fredq@google.com> 1272489005 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1272489005 -0700

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