tree b3876e3a18be1cd6c4b47ec4a55d6ccbbc1e6f5e
parent 7e18f9f537786b3891099b46390f14538d7ae9fe
parent 80d8d4d07c9c6636a591f5de7d08226b422dcba3
author Bill Yi <byi@google.com> 1596916741 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596916741 +0000

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80d8d4d07c -s ours

am skip reason: subject contains skip directive

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

Change-Id: I77c4998fa1886c8768626db6f8c3848160bf00a2