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