am bc1c8847: am 66cc5900: Merge change Ic70239e8 into eclair-mr2

Merge commit 'bc1c8847841689d2f6baa1f729148b4a35af92b0'

* commit 'bc1c8847841689d2f6baa1f729148b4a35af92b0':
  changed SettingsProvider to manage the androidid itself