commit | 717a8521788cd9722d3814d3c8e69d3eb529c32e | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 08 01:39:38 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 01:39:38 2021 +0000 |
tree | b10ca6a2a49781012e5097ba8218dc8da64e7e4a | |
parent | 6d8e0945ccd9b148339acbf528d42aa068a9d9f0 [diff] | |
parent | fdbc0c96ddbc6a35b2fecb74310142e224abd513 [diff] |
[automerger skipped] Merge "Merge Android 12" am: faa64ddbe1 -s ours am: fdbc0c96dd -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: I95556e519254807f0bdcc8f0e54d5cab4ef89869