tree 3cb6e6773549d79f97d469bc35b4a44100c4a765
parent 18bfb47118da473facc146c839fb774b3eaa28b2
parent 6e72fca66513ff9a9c5f0c4c7a7cd0c122bc7edb
author Treehugger Robot <treehugger-gerrit@google.com> 1626373454 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1626373454 +0000

Merge "API level 30 upgrade: AOSP/Calendar" am: 58bb98b529 am: 6e72fca665

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1768565

Change-Id: I43181ebbd8b9cff17a34dd7de569be1d8b5fbc10