Merge commit '6d924c69af055559ed84afaf487aa38bd6fd2e33' into eclair-mr2-plus-aosp * commit '6d924c69af055559ed84afaf487aa38bd6fd2e33': If we fail to persist the current settings and fall back to the back settings file
Merge commit '6d924c69af055559ed84afaf487aa38bd6fd2e33' into eclair-mr2-plus-aosp * commit '6d924c69af055559ed84afaf487aa38bd6fd2e33': If we fail to persist the current settings and fall back to the back settings file