tree 37410f1e258a9642c16f2aa161728f7101dd33cb
parent c60b803327c06c65555d8b2d87aa204b40f5c10d
parent 4c1ee5ab6a96da358ddcec30fd6999bfb9404f58
author TreeHugger Robot <treehugger-gerrit@google.com> 1630139657 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1630139657 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 4c1ee5ab6a -s ours

am skip reason: subject contains skip directive

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

Change-Id: I06fd20aafcd319c0e0e7b6a9d006197f984b74ce