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