tree a5868e42db6b6ba9e964822afff73d61203afb5d
parent f469d3cc295ac8ae54d0e318131813aa53bddfcd
parent 1980d1decee7b28b1afee590302b06a3fc9abf35
author Bill Yi <byi@google.com> 1670266827 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1670266827 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 1980d1dece -s ours

am skip reason: subject contains skip directive

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

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