am 40bf8352: am b04157a8: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '40bf8352fe14b1041b60ee34ad4b5c8ccfbabfe8' into eclair-mr2-plus-aosp * commit '40bf8352fe14b1041b60ee34ad4b5c8ccfbabfe8': Import revised translations. DO NOT MERGEmain
commit
320f9e9134