Merge commit '9d6be2baf517462d2cce818c21b25958a40e4f06' into eclair-plus-aosp * commit '9d6be2baf517462d2cce818c21b25958a40e4f06': Add backup string for a platform setting to enable or disable
Merge commit '9d6be2baf517462d2cce818c21b25958a40e4f06' into eclair-plus-aosp * commit '9d6be2baf517462d2cce818c21b25958a40e4f06': Add backup string for a platform setting to enable or disable