diff options
| author | Victor Berchet <berchet@google.com> | 2022-05-03 00:32:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-05-03 00:32:01 +0000 |
| commit | 91ee25485058b5ef4751bfa0d5942aa2cb452029 (patch) | |
| tree | 9dea42a69a6b3f9190aa99c0dcf160a104cd892f /core/java/android/util/SparseSetArray.java | |
| parent | c7e7366bcac243c9a4a7b3fcc54be8020cde0f28 (diff) | |
| parent | abc0fd6965195515d1f0adb024aa5eb33435a79a (diff) | |
[automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98a6" am: a492c2f2d9 -s ours am: d93fd9dd8e -s ours am: 3020cc3897 -s ours am: ae0479380a -s ours am: 56f74b2e6e -s ours am: abc0fd6965 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814
Change-Id: Ib990fb87512c297f11a5bf4f04e8b6e5a82ad633
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'core/java/android/util/SparseSetArray.java')
0 files changed, 0 insertions, 0 deletions