Merge commit '1073e3fa72a59af15ff4243b65a789ddb61bcded' into gingerbread-plus-aosp * commit '1073e3fa72a59af15ff4243b65a789ddb61bcded': Don't write settings multiple times when unmounting.
Merge commit '1073e3fa72a59af15ff4243b65a789ddb61bcded' into gingerbread-plus-aosp * commit '1073e3fa72a59af15ff4243b65a789ddb61bcded': Don't write settings multiple times when unmounting.