tree 9f2fea61d7a275abbcb9deb274f43b790527ede0
parent 5173bb941226e5fe1cd73517b2d963a737dd27d7
parent 7e56e2919a4ee1cb0ad772b217fac30d9fa156a5
author Bill Yi <byi@google.com> 1650347689 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1650347689 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 16abcdf3c3 -s ours am: 7e56e2919a -s ours

am skip reason: subject contains skip directive

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

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