tree bd95805c4ee2bdb6bb361c61209289a61faa1f97
parent a1cce1a07c2718ed68c53076787d54bb9ddc8821
parent 78abb8334392e1dbaff5dd6849bf3de6b346f566
author Bill Yi <byi@google.com> 1632502823 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1632502823 +0000

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20df40e783 -s ours am: 78abb83343 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I974e8eba87d9ae2fa8b64416407f07823a026ea3