[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 33837c6766
-s ours am: 0cb641a695
-s ours am: 46bd7feab6
-s ours am: 304324ddd0
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22795019 Change-Id: Ife399de8a85dbc27a4246d62dacf8b272f455e69 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: