tree eb36e766f5bcd1fac63cf254cd793e1b4ab4c7f6
parent f7ef0cdb9cabb1d31baddc88ffbc70065ca1dfac
parent 05423e9e560faa8e575dc44bbc5313b2a23de34e
author Bill Yi <byi@google.com> 1662682199 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1662682199 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4312759705 -s ours am: 6f122c6b1d -s ours am: 5eafd62f89 -s ours am: dd44d32335 -s ours am: 05423e9e56 -s ours

am skip reason: subject contains skip directive

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

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