tree 1664b2924e4da9b8c639ec84eab20bc68569e38e
parent 99c5cc9a302133f97ee8af79a9616b212778f70c
parent 2633931de6c24153c8a9bf04cf68c3fa33855bdc
author Treehugger Robot <treehugger-gerrit@google.com> 1670179523 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1670179523 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2633931de6 -s ours

am skip reason: subject contains skip directive

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

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