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

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

[automerger skipped] Merge "Revert "[conflict] DO NOT MERGE Suppress notifications when device enter lockdown am: 85c00b98"" into qt-qpr1-dev am: f44dc5ce -s ours am: 938c647b -s ours

am skip reason: subject contains skip directive

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



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