tree c55b8b0fe4dfdd9657d40345aed1d6793ae0ffee
parent 500834da6fbe4719b36ea1dbb55e9debc1f5107e
parent 9ba64bbc53c3215a0cae0cf52a7b8b7321994f36
author Treehugger Robot <treehugger-gerrit@google.com> 1619124741 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619124741 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 874bf9b051 -s ours am: 9ba64bbc53 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1685006

Change-Id: I0e4c5d54437e676aa19d63d27747eefad5ed34f5