Merge commit '38eeac305a188b7ea4f586071c1d467c3f952be6' into eclair-plus-aosp * commit '38eeac305a188b7ea4f586071c1d467c3f952be6': Don't backup/restore telephony material from secure settings
Merge commit '38eeac305a188b7ea4f586071c1d467c3f952be6' into eclair-plus-aosp * commit '38eeac305a188b7ea4f586071c1d467c3f952be6': Don't backup/restore telephony material from secure settings