tree 93001b12af3bd84da990fd3ed9e65c055cc80db6
parent 0749b2e5b19225e7fa81aa023e71ba4ee1a2f707
parent 681beda2f8f642966a59a9e3e77aa89fa6ed102f
author Treehugger Robot <treehugger-gerrit@google.com> 1599331443 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599331443 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 681beda2f8 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7972af3db5cb995b4a7c4deb982eeef6c3dddaad