[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 586da77594 -s ours am: cac65afe79 -s ours am: 3d4d0267c6 -s ours am: a64f4a4585 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456139 Change-Id: If03edb8b429c4caeb6d04327da85c0103149eb26 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: