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