tree fa386ac88d54b7e559d79f1332689b33dd757fed
parent 3e950774394701c6c4443f97b1bcd2b94d38e022
parent 79cfcb4db223fab4ccd522c18017648375e92ce4
author Bill Yi <byi@google.com> 1650608408 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1650608408 +0000

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

am skip reason: subject contains skip directive

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

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