tree 6c4a37b9fcf90666bd1d64b3e65de50c0e7388f2
parent b5a6e13b5c54038edcc4d6f5379e49436ef58054
parent 59b3f9618905cd526b067915492523d3655db268
author Xin Li <delphij@google.com> 1702335632 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1702335632 +0000

[automerger skipped] Merge "Merge Android 14 QPR1" into main am: e0cb7fc704 -s ours am: 0f162f782e -s ours am: 59b3f96189 -s ours

am skip reason: Merged-In I4a96b82d96e1a98673e7ce9d81080b138b343ea7 with SHA-1 c0ca8f958d is already in history

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

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