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