tree da493e4509961d352fe2ba1b48060284e94442d6
parent 2d3e0c8bb2dff43cafbeebeadd1709d3e7700fa5
parent 56786c831743affef7b3efa45d740645e98f6fd7
author Treehugger Robot <treehugger-gerrit@google.com> 1641865568 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1641865568 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fe140a6410 -s ours am: 8b4a0a04f4 -s ours am: 56786c8317 -s ours

am skip reason: subject contains skip directive

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

Change-Id: If5f83f54ea6cb8885eeab4da7ed529e68235ce1a