tree e8d6daa7e76a0fdc1db807a4790d437651f15510
parent 1c1cca3fa8e3d7947048a708ea949e521bf39602
parent 03b049e8cda00eba3a25dd3bd9efbc0ff95f4236
author TreeHugger Robot <treehugger-gerrit@google.com> 1637265197 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1637265197 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ebd2e1f662 -s ours am: 9adb10d6fc -s ours am: 03b049e8cd -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iaec414e27d113ed2935d442def4e69eadaf74ea3