Skip to content
Commit 65091e4c authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

[automerger skipped] Do not dismiss keyguard after SIM PUK unlock am: 3d89cc5d -s ours 

am skip reason: Merged-In I7c8714a177bc85fbce92f6e8fe911f74ca2ac243 with SHA-1 1e7087f1 is already in history

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



Change-Id: I8a9908159ff4caebddf1433437fe36d128a17aaf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6c9ae0c8 3d89cc5d
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