[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a18ff15076
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16986293 Change-Id: I8850b59a5b02dd11a1f8ffaeeb8bb2ef0fabca90
This commit is contained in: