Merge "[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 960fa1521c
am: c4649b3ede
-s ours" into udc-dev-plus-aosp am: 5e3e804b39
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22794712 Change-Id: I8436defb2dbb3ca43c8461b8d02f51d71693da21 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: