Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6424f8d388
-s ours am: 1da0b28099
-s ours am: d0f541a7d4
-s ours" into tm-d1-dev-plus-aosp am: 2ef95bb8e5
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18425265 Change-Id: I70d0ece9fa040b12ebe7046a5231d24e6c91f360 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: