diff options
| author | Iavor-Valentin Iftime <valiiftime@google.com> | 2023-12-05 17:37:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-05 17:37:14 +0000 |
| commit | 9ab4a5424fe8c87850a305532d4b42c06e5b9b70 (patch) | |
| tree | f53c6a0da29368c1ebd9f20524eafb740af00023 | |
| parent | 2d25c9b0b547f205d2c1c3a3d479649a254512d6 (diff) | |
| parent | f3bcfc233e5ea8737baf9cba9aa6a95404b17ab7 (diff) | |
| download | base-9ab4a5424fe8c87850a305532d4b42c06e5b9b70.tar.gz | |
[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 skip reason: skipped by user valiiftime
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25508273
Change-Id: Ifcf1c0ee5708ae7cdc393e290dcdd2348111d4be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions