Merge change Ic70239e8 into eclair-mr2

* changes:
  changed SettingsProvider to manage the androidid itself