| commit | 84975a43328340ec43b9053841c056ee511e35b8 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 01:39:49 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 01:39:49 2021 +0000 |
| tree | c9dc8dfb27aeebd6daf5c8c04627e9bd0d18b961 | |
| parent | 8bf09180455ac4c95ebbf08d2e844762f8e5a9d8 [diff] | |
| parent | f8ff433f2974d06f71adb582dbe4d0b75ce0b770 [diff] |
[automerger skipped] Merge "Merge Android 12" am: 2d9cb9aa92 -s ours am: f8ff433f29 -s ours am skip reason: Merged-In If0b691fb263ee2717844e8bda388310d2360ffd6 with SHA-1 43f6eccdbe is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/1847440 Change-Id: Ia0afb405553cd7bcf5ee2ef1282081a37e09c408