tree da493e4509961d352fe2ba1b48060284e94442d6
parent 9e22464ec0d9445083977666c832265689d2bff3
parent 6437b8590b8e24f3ec76c217806f6959d3e19f8c
author TreeHugger Robot <treehugger-gerrit@google.com> 1641707301 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1641707301 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I94760890a5fbd36af6a210251279160f4d14d0fb