[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 7fb8f02f4e
-s ours
am skip reason: contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3378198 Change-Id: I5595a4c81cb5fe774cf988e3f93a314f9dcfac7e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: