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