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