tree ba2643b93bc61cf32ccf7e5f998892c80418c5b1
parent 533f5cbf3d4eed5e6ca0f12aa3dfd95f77778918
parent 3af8d0fdf4f9f4736ab9c2c9182bc025f6e34ab8
author TreeHugger Robot <treehugger-gerrit@google.com> 1637267695 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1637267695 +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: 3af8d0fdf4 -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: I4efa9937ddd9a741baff64e46de112b5e46b361c