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