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