tree 14bce4b768a4a6a1cabb6b95accb028620205a51
parent 90d4f63d083e1d4e68bc679bf74aa08fa8caddbb
parent fff6a918edcad247b9bf940ade30808c185d08b7
author Bill Yi <byi@google.com> 1670270833 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1670270833 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 1a51c0ca0f -s ours am: fff6a918ed -s ours

am skip reason: subject contains skip directive

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

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