tree b7e3b73448613d0ab5b9f11069ff915ad968c919
parent e74c9ae07b0210ac7def85755de368c78c24f67e
parent 36ae9f88a2d1e833e201570da5d854ac12135681
author TreeHugger Robot <treehugger-gerrit@google.com> 1637045733 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1637045733 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I5ebcb03785306ba49911357140a9d8570e713634