Merge commit '094e3e0bcc81a795f35ac2ea218d0fc0109100cf' into eclair-plus-aosp * commit '094e3e0bcc81a795f35ac2ea218d0fc0109100cf': Check if rename of backed up file fails before persisting new changes.
Merge commit '094e3e0bcc81a795f35ac2ea218d0fc0109100cf' into eclair-plus-aosp * commit '094e3e0bcc81a795f35ac2ea218d0fc0109100cf': Check if rename of backed up file fails before persisting new changes.