tree 885fe90f5efc1e4bc8a8798f626cb5ceedf317ed
parent 7d183f378dd2cc68be6fb16ca42c433aeedf6f01
parent 5fa229307c2d8d97e9831fd6ea86be6aaa06f33a
author TreeHugger Robot <treehugger-gerrit@google.com> 1664577043 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1664577043 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 025f6d4ca4 -s ours am: 5fa229307c -s ours

am skip reason: subject contains skip directive

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

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