tree 3454c6132ef8de9a2af9956f0f0ececcbac000f8
parent bc38e6c727f7144f3359c294820e834f339babfc
parent 9c944b0df9b8f2c8df962c35eeda43b040595d54
author Bill Yi <byi@google.com> 1659969895 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1659969895 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e5fd09c19f -s ours am: 9c944b0df9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I99738a23f18ceb22cbb741112dc913d0358cfbaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>