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