am 7f49b198
: (-s ours) am df0ad0dc
: am aa03b2f6
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit '7f49b198d0f7477cf6a64e704260373b65ba71f4': Import translations. DO NOT MERGE
This commit is contained in: