tree 885fe90f5efc1e4bc8a8798f626cb5ceedf317ed
parent 0d40ca443e271ce65e8d36321f4ef7ac42888a53
parent c3ca3027c26748533e3acaa8c1b189ec340e971d
author TreeHugger Robot <treehugger-gerrit@google.com> 1658856043 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1658856043 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: c3ca3027c2 -s ours

am skip reason: subject contains skip directive

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

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