tree efa11c59da843e994c4ebb204d8bb1e3fb319479
parent 40792df672784aa95fa04b434428ba006d812e0f
parent 063f84501d77f733cee1a78a2152509097ac1227
author Xin Li <delphij@google.com> 1599795222 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599795222 +0000

[automerger skipped] Merge "Merge Android R" am: 6ef1b07d5f -s ours am: b83657c630 -s ours am: 063f84501d -s ours

am skip reason: Change-Id Ifb8126ec6c2ae6e79afc1a0cc620dc2f062df96d with SHA-1 8a951f4eb8 is in history

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

Change-Id: I00d2f48647683379062b4d45a1cf7de72543143e