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