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