| commit | 395a6df8eaf449649ca4a8cc2c1d805a64eacc0d | [log] [tgz] |
|---|---|---|
| author | Matt Pietal <mpietal@google.com> | Thu Sep 15 20:58:34 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 15 20:58:34 2022 +0000 |
| tree | 9101d80e8b08e3b5bea56695ea3c4d47bf73edc6 | |
| parent | f6abea6e862f780d4ed3706ab6ab46a6ef6af106 [diff] | |
| parent | 2fe69d854293fe0960f46a94aab0a1065f064c64 [diff] |
[automerger skipped] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: c27cf661a6 am: 2ebce335cc -s ours am: 13ac3a30cc -s ours am: 7ef1e5f3a7 -s ours am: 65ea1811ca -s ours am: e06f474627 -s ours am: 841bc866be -s ours am: e7d18c384b -s ours am: 2fe69d8542 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19952027 Change-Id: I9e1163c126265b2780d1bd2f6085f817051c3799 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>