tree e1afe796a30a997804d929675b1208b4b91653f1
parent d1c7bb077ab5b4168d68c8f704b9002ec9dc78f1
parent a0f58ae81bd981b9efbfe3d72b989f81395e9188
author Bill Yi <byi@google.com> 1632508172 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1632508172 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ffa2c65c22 -s ours am: ee7f088a94 -s ours am: ffc08e5492 -s ours am: a0f58ae81b -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id072be2d9ce2a4e07badb732275500d9416f7c61