[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: f89dd1307c
-s ours am: ed32f93dbd
-s ours am: a6ed699018
-s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1539148 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I588de92c0f984f0848bb5b48a4f2fa06980d1378
This commit is contained in: