tree 163920c8e35f050784eb2dca9cebe0c9983c5ebb
parent cccbd9b8ad3b210df06071f12bee5ec580063212
parent cac2ca6a8d4566c357cc814862859b2d9d5826db
author Treehugger Robot <treehugger-gerrit@google.com> 1648450236 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1648450236 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5ed287b409 -s ours am: cac2ca6a8d -s ours

am skip reason: subject contains skip directive

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

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