tree 163920c8e35f050784eb2dca9cebe0c9983c5ebb
parent dc224c7a3b4cd97aed4f93473315c0614d4a3b60
parent 554da1eea10cd1e71e714dbe68c20f09c8f92fe0
author Xin Li <delphij@google.com> 1633679797 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679797 +0000

[automerger skipped] Merge "Merge Android 12" am: e01f5c06e8 -s ours am: 3abc9aee54 -s ours am: 554da1eea1 -s ours

am skip reason: Merged-In I7bc3cf534c65a5b976b410f0050e6a5caca312fc with SHA-1 3843c34a3a is already in history

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

Change-Id: If4ac673bf6d775b2025cb9a55a4097e613fb2a21