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

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 43f6eccdbe -s ours am: 8bf0918045 -s ours am: 17b8a3cb2f -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: Ic2cfc8e9e72fac0043dc3d0176af7a205ba260d3