summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorFred Quintana <fredq@google.com>2010-04-28 14:13:55 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-28 14:13:55 -0700
commit00b92b943ff397cb7f7c4827a0eea9df7aa22071 (patch)
tree39dd3fdf0488417c873dff2181eccab9c3e0818a /services
parent725f731cb9368f52a0c6664d2961ef4340c8f7a0 (diff)
parent9aaf24f2a46eacd1e342f8c0300c3093646e2814 (diff)
downloadframeworks_base-00b92b943ff397cb7f7c4827a0eea9df7aa22071.zip
frameworks_base-00b92b943ff397cb7f7c4827a0eea9df7aa22071.tar.gz
frameworks_base-00b92b943ff397cb7f7c4827a0eea9df7aa22071.tar.bz2
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
Diffstat (limited to 'services')
0 files changed, 0 insertions, 0 deletions