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