tree 1664b2924e4da9b8c639ec84eab20bc68569e38e
parent 55ae0a8d5e08e118539f550d72e77369e5fc407b
parent 07655f37de9789bca0f2f33d2230379f4247e87c
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1658545786 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1658545786 +0000

Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a6ecc274e5 -s ours am: f2fe4db511 -s ours am: d52692a1c2 -s ours" into tm-d1-dev-plus-aosp am: 07655f37de -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/timezonepicker/+/19383107

Change-Id: Ia2d6aa74a9a9bafb613181727909f6fa6a7227d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>