[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: 052b6c9967 -s ours am: 03f301f53c -s ours am: f7f7bbfc01 -s ours am: 7cc4baedf0 -s ours am: ed0570284c -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: I968d2e9684b585c1222e4d661908170c20ff543e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

...

This commit is contained in:

Matt Pietal

2023-02-23 23:47:09 +00:00

committed by Automerger Merge Worker

parent b6fa74ea8f ed0570284c

commit dd933897ec

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