tree 3454c6132ef8de9a2af9956f0f0ececcbac000f8
parent 35741daf2086794437c5856ab83abc2a97a887f8
parent bab2b2ca3c5ad29b07a57698dfae47ab314cc482
author Bill Yi <byi@google.com> 1659970017 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1659970017 +0000

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

am skip reason: subject contains skip directive

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

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