commit | f8ff433f2974d06f71adb582dbe4d0b75ce0b770 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 08 01:20:23 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 01:20:23 2021 +0000 |
tree | c9dc8dfb27aeebd6daf5c8c04627e9bd0d18b961 | |
parent | 43f6eccdbed75de0bd79ba2331eb9026bf540be0 [diff] | |
parent | 2d9cb9aa925d7e7d11bb44719bf3e4536d9a8075 [diff] |
[automerger skipped] Merge "Merge Android 12" am: 2d9cb9aa92 -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: I97f979111e1cd992f53019aacfc3ec7317392296