tree 14bce4b768a4a6a1cabb6b95accb028620205a51
parent ba4add8549044b704bdeb40bcdd5ea1979d4390e
parent 1c42065d1048cb3bd4487dee2c8e16e1bf5cb025
author Treehugger Robot <treehugger-gerrit@google.com> 1670186608 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1670186608 +0000

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

am skip reason: subject contains skip directive

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

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