| commit | 55207bf228a9e54a8ca41dc9930a5fc278ca84f8 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 08:29:52 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 08:29:52 2021 +0000 |
| tree | b10ca6a2a49781012e5097ba8218dc8da64e7e4a | |
| parent | fe84edbf776fbf96eaf91ea4b0b6be37bbc4f4a2 [diff] | |
| parent | 0f74fbfdb6f1d626a931358e9d5a7a5210217800 [diff] |
[automerger skipped] Merge "Merge Android 12" am: faa64ddbe1 -s ours am: fdbc0c96dd -s ours am: 717a852178 -s ours am: 0f74fbfdb6 -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: I301ffbfd141893c73b4c3b90b3830330ed43fc2e