am 11bf335a
: (-s ours) am 1a886f80
: Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread
Merge commit '11bf335adb109a63ac3e1ea17ee9f61909708c0b' * commit '11bf335adb109a63ac3e1ea17ee9f61909708c0b': Preserve old translations for changed strings. DO NOT MERGE
This commit is contained in: