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