tree 697cb0f7f967a2993534bc31ac666385fd177911
parent 0e520dd82c44d4f435b7a37aff4ff6d0bc2fd128
parent 504cc273abe6284a2c6ef9c7c28f94b46b4f1725
author TreeHugger Robot <treehugger-gerrit@google.com> 1632501904 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1632501904 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: Ib38b2e25557bc850795b22813c6d16914c70ebf7