tree f5fb970846e75be707ff7bdd97b2566a0470eb99
parent 2da12ca72f376fd6ed2105c710edaa9606f10508
parent 21becd147692eadec31929cfbe3a97c88550f08e
author Xin Li <delphij@google.com> 1725676890 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1725676890 +0000

[automerger skipped] Merge 24Q3 to AOSP main am: 8fca89685c -s ours am: 21becd1476 -s ours

am skip reason: Merged-In I2afb858aff83da884c39748ad25b8d29a74837c1 with SHA-1 9d2fba7d5b is already in history

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

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