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