| commit | 48bd9613dc47fe61deab1b9b1a8633f2c54e5b41 | [log] [tgz] |
|---|---|---|
| author | Iavor-Valentin Iftime <valiiftime@google.com> | Tue Dec 05 20:55:50 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 05 20:55:50 2023 +0000 |
| tree | 125f0f45c3a56a537ee94a3ec54577b3e89ccaee | |
| parent | a77c5c9a01989bd3c20f9ebceb087346f0ce5d75 [diff] | |
| parent | dfdaee6a300bbb75738cf7181ec27f7cdec95540 [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: dfdaee6a30 -s ours am skip reason: skipped by user valiiftime Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25508273 Change-Id: Ic157276639b59973ea6b19c02740efc214dba831 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>