Skip to content
Commit ae047938 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 skip reason: subject contains skip directive

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



Change-Id: I9e265bf6eac9c52fe31f63425fc06147cd3b64ea
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b15df339 3020cc38
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