| commit | 0da4a3b63c02d7f55680a7fc4be04d360573b943 | [log] [tgz] |
|---|---|---|
| author | Andy Stadler <stadler@android.com> | Tue Oct 05 15:18:04 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 05 15:18:04 2010 -0700 |
| tree | fe1efeef91a9d9d0d4e127011e857642dd678670 | |
| parent | d058f8abcd27f454f065f4a802a8bb42e413451b [diff] | |
| parent | 79b05696876aadada8cb3f21f89f36b7ae72121d [diff] |
am 79b05696: (-s ours) am d7876681: Reorganize startup/shutdown code in SyncManager DO NOT MERGE Merge commit '79b05696876aadada8cb3f21f89f36b7ae72121d' * commit '79b05696876aadada8cb3f21f89f36b7ae72121d': Reorganize startup/shutdown code in SyncManager DO NOT MERGE