tree c9dc8dfb27aeebd6daf5c8c04627e9bd0d18b961
parent 4553997a7115647fbe271e1b538605ce4a5f79ec
parent e154e7e6c64c429202b29be9566a9e116190f794
author Xin Li <delphij@google.com> 1633681802 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633681802 +0000

[automerger skipped] Merge "Merge Android 12" am: 2d9cb9aa92 -s ours am: f8ff433f29 -s ours am: 84975a4332 -s ours am: e154e7e6c6 -s ours

am skip reason: Merged-In If0b691fb263ee2717844e8bda388310d2360ffd6 with SHA-1 43f6eccdbe is already in history

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

Change-Id: Ibd320641fffe7d4fde996a5be882f52ce59d9893