tree b5f32b3f0d6828f85654b97d8a8682c7e526e726
parent 93b29e9aa9c470628861aa431018374b08ecc6d2
parent 4c2be1bd0c882634a7b81c61b7391f96eb2de4f9
author Treehugger Robot <treehugger-gerrit@google.com> 1664085919 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1664085919 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a67ccd8e62 -s ours am: 1534bf0fb5 -s ours am: 019a0deafe -s ours am: 4c2be1bd0c -s ours

am skip reason: subject contains skip directive

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

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