[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2a57051294
-s ours am: 44f10293dd
-s ours am: 687ba7a903
-s ours am: 3f81e0c4f4
-s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229958 Change-Id: I2edddad61a1db601cf779c1f2930783aa1988698 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: