Plain Diff
am c08688e0: am 78b21f3b: am 954afb2e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev * commit 'c08688e0':