tree c9dc8dfb27aeebd6daf5c8c04627e9bd0d18b961
parent 17b8a3cb2f78fcca2475dca3bfabd3263d14f5f6
parent 84975a43328340ec43b9053841c056ee511e35b8
author Xin Li <delphij@google.com> 1633679825 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679825 +0000

[automerger skipped] Merge "Merge Android 12" am: 2d9cb9aa92 -s ours am: f8ff433f29 -s ours am: 84975a4332 -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: Ia694a96ca1e10688a9dc425c75c204333cd3f2ae