tree 09420733fe1f6f5a5d98a37243aa67686f354f3a
parent ee7f088a94f113b846074ef2b59996f8fc1d8a40
parent d43653e80d8266da51440b3da2279b6f86e26703
author Bill Yi <byi@google.com> 1632504441 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1632504441 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I2820410fc0de20dd6ec3b8fe2bb92dc593b6b3e7