diff options
| author | 2023-12-05 19:49:34 +0000 | |
|---|---|---|
| committer | 2023-12-05 19:49:34 +0000 | |
| commit | 1006b4f3de75b8c4d2937577b9bea46d644fcf12 (patch) | |
| tree | a1b6e7c886ccad40ed8cd22045070604b8073895 /libs/androidfw/ConfigDescription.cpp | |
| parent | 77ba2f28a1d69c0a6aa66bb4ec9284e4ff689fe9 (diff) | |
| parent | 539a707134fb92388f54313ae4bda26401b6bf54 (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: 539a707134 -s ours
am skip reason: skipped by user valiiftime
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25508273
Change-Id: I4d6096556a0de9b7733b5f3c31eae4cddd29ace7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ConfigDescription.cpp')
0 files changed, 0 insertions, 0 deletions