tree d6e9a9f94664db070681dbfa6720e7d0691197fe
parent 7a05400c26ff1fc17cf286ccf2dd67ac05e997ac
parent 49334701663be259b9cbe1a15c9f722a7af04ef3
author Bill Yi <byi@google.com> 1636010463 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1636010463 +0000

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 64149823f2 -s ours am: 8736277f07 -s ours am: 775e9c5605 -s ours am: b78ee724ae -s ours am: 4933470166 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I484e3772e80fd51e23571edbb698ffc60f5a6360