[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: f89dd1307c
-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: I9a22c4edab65206bd4441d791c19fda687276057
This commit is contained in: