Merge commit 'dd49624ed049d6f2f9946f71381bcde83f19e5e0' into gingerbread-plus-aosp * commit 'dd49624ed049d6f2f9946f71381bcde83f19e5e0': Del "erase" from new unmount setting subtext
Merge commit 'dd49624ed049d6f2f9946f71381bcde83f19e5e0' into gingerbread-plus-aosp * commit 'dd49624ed049d6f2f9946f71381bcde83f19e5e0': Del "erase" from new unmount setting subtext