abdb3037ed
Merge commit '0d51d63595014c4237010118aaac891e657c2d23' into eclair-plus-aosp * commit '0d51d63595014c4237010118aaac891e657c2d23': Check if rename of current settings file was successful before persisting