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