am 40653ae9: (-s ours) am f82c5022: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit '40653ae9bb9e3e5bd647ce8da9ab0b095bde6849': Import translations. DO NOT MERGE
This commit is contained in: