| commit | 0dcbd6de315f491e92179bfb223134c599ade838 | [log] [tgz] |
|---|---|---|
| author | Iavor-Valentin Iftime <valiiftime@google.com> | Tue Dec 05 19:12:07 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 05 19:12:07 2023 +0000 |
| tree | 7afe9621a131f4739a01323588551fe8fa50533a | |
| parent | 73c68030cc245f70361e0ef66119f6e5358a35eb [diff] | |
| parent | 9ab4a5424fe8c87850a305532d4b42c06e5b9b70 [diff] |
[automerger skipped] [conflict] Merge "Enforce persisted snoozed notifications limits" into sc-dev am: 5ac423b8c2 am: 40272384d0 am: a596d7b2aa am: 772f6c9946 am: b41467e848 -s ours am: f3bcfc233e -s ours am: 9ab4a5424f -s ours am skip reason: skipped by user valiiftime Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25508273 Change-Id: Ib6aafa0a13d65ef2df33a615fa2d9cf478e7b4e3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>