Plain Diff
am: 6b0e9f33 -s ours * commit '6b0e9f33': Import translations. DO NOT MERGE Change-Id: I0ddbb7b0d8713b7b1638e5d3ce6f9279dea05e68