tree 0f0ae6f23b3308c5a3cfb594b208c03b1df257f8
parent 69d01e73140c334ec7145b843ca8c175a4148965
parent 8d6c2d0b1dc4236e1baca1d21760e391884c4cea
author Bill Yi <byi@google.com> 1659967785 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1659967785 +0000

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

am skip reason: subject contains skip directive

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

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