tree c00247bccea33e303dd4917a2143e01810906f8f
parent 59d01eec17569aae1f7dafaf18437ffb102e6fe6
parent 6228bd3469751a49f97defb2a11bafeddff1da9a
author TreeHugger Robot <treehugger-gerrit@google.com> 1633677822 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633677822 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I53f408bfeed1ac6becafa5c24b2fe58e76bf3bf3