tree da493e4509961d352fe2ba1b48060284e94442d6
parent d2a838e2d1221c7a0d0d24447a742e1ed6b00d8b
parent c002768550fae9b7f7fbc7c725d5a91a338b685a
author Treehugger Robot <treehugger-gerrit@google.com> 1641865619 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1641865619 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 48c90fde8a -s ours am: d7b3c851b5 -s ours am: c002768550 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iac22f27bc0535e7cd48f2ff854959594b307cdc3