[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f996cfceba
-s ours am: 059773bd86
-s ours am: 1dc6b2d265
-s ours am: 28a5ce5fc5
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23559398 Change-Id: I0b2e72f26f38cab231f31f10318de618f654dee6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: