tree 6c4a37b9fcf90666bd1d64b3e65de50c0e7388f2
parent 53ba97ecd560c03ac1d3421c09e1677729c92218
parent 9264ec71036a20a3aa73e201b5ba751127eb4ea0
author Xin Li <delphij@google.com> 1696638359 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696638359 +0000

[automerger skipped] Merge "Merge Android 14" into main am: 5658ef9cac -s ours am: e1913229ae -s ours am: 0e4778cebd -s ours am: 2598f38a07 -s ours am: 9264ec7103 -s ours

am skip reason: Merged-In I16919b379b64764ebc7a41bf150fd92260a2e5dc with SHA-1 c536726eec is already in history

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

Change-Id: I0e81dd279dd38891cd7ef5f5a074c567fe3c624b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>