tree 45f7b8863a37c4e7f13775500858677fd947332e
parent 073dc761c1ceddd95a1d96769385d98f0239211d
parent 0e4778cebd804ba9fee69cdf649c31bce3c28810
author Xin Li <delphij@google.com> 1696586199 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696586199 +0000

[automerger skipped] Merge "Merge Android 14" into main am: 5658ef9cac -s ours am: e1913229ae -s ours am: 0e4778cebd -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: I6bb501bd18bd1a726b2a6aa486a25833253300f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>