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

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 43f6eccdbe -s ours am: 8bf0918045 -s ours am: 17b8a3cb2f -s ours am: 4553997a71 -s ours

am skip reason: Merged-In I3187fe574f21977fa8006ab92072636f2ee110ce with SHA-1 e195d494a5 is already in history

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

Change-Id: I18c380950111007dcaaaaa67d894b822bf0885c2