tree b10ca6a2a49781012e5097ba8218dc8da64e7e4a
parent 7b2d3309b8984a40331c3d4f54e636df81ba1720
parent faa64ddbe1e395c484d43da727e6a82184a2535f
author Xin Li <delphij@google.com> 1633656013 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633656013 +0000

[automerger skipped] Merge "Merge Android 12" am: faa64ddbe1 -s ours

am skip reason: Merged-In I048709a2a2e1d782131e1260b8e675ce409dc150 with SHA-1 7b2d3309b8 is already in history

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

Change-Id: I0d302c8ffacb6e4eba20461ccccbe6b6a710fa6f