| commit | 9d756fbb4fe29fc529c64ed4ac742dfc0cc7b089 | [log] [tgz] |
|---|---|---|
| author | Matt Pietal <mpietal@google.com> | Thu Sep 15 21:00:02 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 15 21:00:02 2022 +0000 |
| tree | 9101d80e8b08e3b5bea56695ea3c4d47bf73edc6 | |
| parent | fdcfaa35f007978dd5769bad79cabf9b539fa56e [diff] | |
| parent | d0118289eb546a2ab95c892fdb3892b28060f0f4 [diff] |
[automerger skipped] Merge "[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock" into sc-dev am: d1afd041a1 -s ours am: 582d8e0262 -s ours am: 50f0b58d80 -s ours am: 5933a823ea -s ours am: 31a5f9dae5 -s ours am: 830e7e5af6 -s ours am: d0118289eb -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19641101 Change-Id: I87a14aea2a864d4c0e217fe4a38f7e2ff8ba9673 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>