Merge commit '365ef4a095189573b67573f6750f5891c11b7895' into froyo-plus-aosp * commit '365ef4a095189573b67573f6750f5891c11b7895': Update strings for backup
Merge commit '365ef4a095189573b67573f6750f5891c11b7895' into froyo-plus-aosp * commit '365ef4a095189573b67573f6750f5891c11b7895': Update strings for backup