Skip to content
Commit 56f74b2e authored by Victor Berchet's avatar Victor Berchet Committed by Automerger Merge Worker
Browse files

[automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications... 

[automerger skipped] Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98" am: a492c2f2 -s ours am: d93fd9dd -s ours am: 3020cc38 -s ours am: ae047938 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18125814



Change-Id: I5b2dc3b08f41fcc64196de6e94d1d921da0cb8dc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4da2a453 ae047938
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment