| commit | dfdaee6a300bbb75738cf7181ec27f7cdec95540 | [log] [tgz] |
|---|---|---|
| author | Iavor-Valentin Iftime <valiiftime@google.com> | Tue Dec 05 19:49:38 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 05 19:49:38 2023 +0000 |
| tree | 2559b1f53da89b874acb2a89b4bd130886ea1d1b | |
| parent | b786af7c6b8b78be0d0e71e5d0ff244103ab0bf8 [diff] | |
| parent | 0dcbd6de315f491e92179bfb223134c599ade838 [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: 0dcbd6de31 -s ours am skip reason: skipped by user valiiftime Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25508273 Change-Id: I0e93c99ab60ab7585f25c40459c15b3f18e28696 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>