[automerger skipped] [conflict] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: a30148b8a4 am: 02b525316e -s ours am: d17cc27210 -s ours am: 898d578fa1 -s ours am: 9b928f8140 -s ours am: e855f9c3b3 -s ours am: 7c4da0ebf1 -s ours am: aebe4548c2 -s ours am: 769b05b529 -s ours am: 9f2a677234 -s ours

Browse Source

am skip reason: subject contains skip directive

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

Change-Id: If2e52418b984e66cb42765f58e035753d9615cf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

...

This commit is contained in:

Matt Pietal

2022-09-19 23:14:28 +00:00

committed by Automerger Merge Worker

parent 4e039434b0 9f2a677234

commit 796c219f20

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available