Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a547374df
-s ours am: 015915736f
-s ours" into tm-qpr-dev-plus-aosp am: e5b6d1e219
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19472171 Change-Id: I895eff7ba4874192bafcbbe815b9b4953c2aa422 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: