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