Merge commit 'aa1f8aeeea1c27fe88270cc8b5df970d9f292385' into froyo-plus-aosp * commit 'aa1f8aeeea1c27fe88270cc8b5df970d9f292385': Clarify backup setting
Merge commit 'aa1f8aeeea1c27fe88270cc8b5df970d9f292385' into froyo-plus-aosp * commit 'aa1f8aeeea1c27fe88270cc8b5df970d9f292385': Clarify backup setting