tree 8f2890332e0d0ff8f996d2b0be2742e86e2b30ee
parent b9efabb5d15bb3a3b8cc6f5d3c7cf3c8dc2835fa
parent c3ec49331fe1da20640d0f377f153c2cbe7663b9
author Bill Yi <byi@google.com> 1691208833 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1691208833 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: c3ec49331f -s ours

am skip reason: subject contains skip directive

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

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