| commit | 9f605a6fe112319d34ab2ce42b5560e0322f29cd | [log] [tgz] |
|---|---|---|
| author | Matt Pietal <mpietal@google.com> | Mon Sep 19 21:37:47 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 19 21:37:47 2022 +0000 |
| tree | 1915fe650f58506eef67388285071d71a3dec772 | |
| parent | 9579863ee4d60f9a3f39f5c8794832d2dfff00d0 [diff] | |
| parent | aebe4548c2a14ba744abf13b2f5f9d652f682e16 [diff] |
[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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19969212 Change-Id: I04e1f9737b56b4535fa4fcac29dc14473278344f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>