Merge commit '745e751b251baa38e94dfce1fe264574d0204cc2' into gingerbread-plus-aosp * commit '745e751b251baa38e94dfce1fe264574d0204cc2': Preserve old translations for changed strings. DO NOT MERGE
Merge commit '745e751b251baa38e94dfce1fe264574d0204cc2' into gingerbread-plus-aosp * commit '745e751b251baa38e94dfce1fe264574d0204cc2': Preserve old translations for changed strings. DO NOT MERGE