tree 271f513e6157fef7c6e856d082263fa63df4284c
parent 65575cfb66a39ef8e161cdc4e59042e96ca5418f
parent 24cabff9dd6abaa29eb2a66aad41b85fad30218d
author The Android Open Source Project <initial-contribution@android.com> 1596768655 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596768655 +0000

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24cabff9dd -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: I98d9f4f2f16671fa0ca8d6c7c237a76f5ba56206