tree e1afe796a30a997804d929675b1208b4b91653f1
parent ac3e1b5918fdf4291b78c0726e0e11d2f8033a84
parent de9f58d841ba3dbeb72d0572e5a5d72a7c24c21f
author TreeHugger Robot <treehugger-gerrit@google.com> 1632503149 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1632503149 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: Ieb06a9c43100619ccc01bcbfc4a2ec97cc5593a2