Merge change I4458a55d into eclair-mr2

* changes:
  Add access to ContentProvider for SyncState.