[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 0a2b1de3a5
-s ours am: 6c9433b31e
-s ours am: 2a21fa1024
-s ours am: 23d0c812a8
-s ours am: a0bc08526b
-s ours am: ae05f6c7a0
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054679 Change-Id: I3e503a05d1ec5e0863ba7ade13d33ba87576c0a6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: