tree 5af4ef50c07a29957a451f6dd02bfc815175a69d
parent ce917cbad04aa6afff3d607596d111126e601fc8
parent b4752ee39f38734e4a5b4fb3949e6ff8ab6dc944
author The Android Open Source Project <initial-contribution@android.com> 1596769612 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596769612 +0000

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24cabff9dd -s ours am: b4752ee39f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I03bf43bdeafdcea7402eaf92c12ae8634867a6c7