Merge change 24499 into eclair

* changes:
  Modify android.syncml.pim so that no one is going to use.