tree a964b819204c100d8a906d7d035ef0cffe67ea6d
parent 2309f00455d689b2cfb87617cc6500b80a5d10ec
parent a3af1db9109b97f7ae9013d9594caa24c3954c41
author Bill Yi <byi@google.com> 1680461173 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1680461173 +0000

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

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22393776

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