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