[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 681beda2f8 -s ours am: ada75ad54d -s ours am: f75d48d9f8 -s ours am: 8b2080e7cc -s ours am: 002c5b1143 -s ours am: bcb6d4f444 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420393 Change-Id: I66c7a7a33149c119a6d9e824d35a31d738fbbe60
This commit is contained in: