[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 3cc4247a1a
-s ours am: 410e8ac5af
-s ours am: 7c2ebdf095
-s ours am: c6aadfbd61
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22480519 Change-Id: I6c8fac48ce60b6afb3c0fe69a8e6b6eaad7284c7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: