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