Skip to content
Commit f2f6a0e5 authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

[automerger skipped] DO NOT MERGE Dismiss keyguard when simpin auth'd and...... 

[automerger skipped] DO NOT MERGE Dismiss keyguard when simpin auth'd and... am: 09f00472 am: a4ff8bed -s ours am: a42e85b0 -s ours

am skip reason: subject contains skip directive

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



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