tree 4aac9a2e603f8a12ace5ef7dfde18cd04dc9e3e7
parent 4b72049845a9013976998ae7d80ebffe0e606336
parent 6b38523ea79a8a1f822a6b0a62c2ff1b149c9b65
author Bill Yi <byi@google.com> 1629397062 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629397062 +0000

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 15b602ca6e -s ours am: 6b38523ea7 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I471e1732559ef8be5da269d0ac57e8e9248d0b0a