tree 44dc2fa12f2607e9f6d82c8e1240df64c1678af7
parent 66e2620e69b5ceba54f40678e1d13483f0680958
parent 131de319c0ec09bd089e67c5c47563725d2eb373
author TreeHugger Robot <treehugger-gerrit@google.com> 1640285452 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1640285452 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 131de319c0 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I48449a1f33fceb37ba855e2bf2c5c8d63b2e87de