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