am 7f6a191e: (-s ours) am df944b30: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '7f6a191e6e293181a081e22b8fa43bd9799bfec2': Import translations. DO NOT MERGE
This commit is contained in: