tree e90d18e6ceb94d038ecda60dbbede8c6bbc24590
parent aab1ff454cbf6d899a9aad3a986308aa3cfff77b
parent 5d32156275e7d43e768d8f7c4d6b6ad25d43644d
author Almaz Mingaleev <mingaleev@google.com> 1663009041 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1663009041 +0000

[automerger skipped] Merge changes from topic "cherrypick-tzdb2022a2_sc-timezone-dev-b5n4zfxlfw" into tm-dev am: 9736168a6b -s ours am: 5d32156275 -s ours

am skip reason: Merged-In I46902801b8a6388f7841309547d8d767ee9e95e9 with SHA-1 2c8afe22ce is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/19659831

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