tree efa11c59da843e994c4ebb204d8bb1e3fb319479
parent 31adf69cd845767bbaaf3eb6ac95b60ff8ac6628
parent 8a951f4eb85b56deb0a0fe1d036c34ba9491cd5c
author Xin Li <delphij@google.com> 1598992639 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598992639 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 8a951f4eb8 -s ours

am skip reason: Change-Id I43f896443fd0b36d3538b242bdaa859181eb8eee with SHA-1 31adf69cd8 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/12470196

Change-Id: I3ef5c3a914682324f71e8a51d670bee13d8fb9d6