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