Merge commit 'd163f4babe101b89aaf322c34d3bafeae237f7da' into eclair-plus-aosp * commit 'd163f4babe101b89aaf322c34d3bafeae237f7da': Don't back up / restore certain sync-related settings
Merge commit 'd163f4babe101b89aaf322c34d3bafeae237f7da' into eclair-plus-aosp * commit 'd163f4babe101b89aaf322c34d3bafeae237f7da': Don't back up / restore certain sync-related settings