am e62c9069: am 05e16515: (-s ours) am cb5624b8: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit 'e62c9069f6878cb23e7b2860e3f3ec67d47ad2e9': Import translations. DO NOT MERGE
This commit is contained in: