Merge commit 'f9f7718f6493ff57e57c7c278311cbe2a0a4042c' into eclair-mr2-plus-aosp * commit 'f9f7718f6493ff57e57c7c278311cbe2a0a4042c': changes from Sync Manager API Review: bug 2164262
Merge commit 'f9f7718f6493ff57e57c7c278311cbe2a0a4042c' into eclair-mr2-plus-aosp * commit 'f9f7718f6493ff57e57c7c278311cbe2a0a4042c': changes from Sync Manager API Review: bug 2164262