| commit | c3657db71e48e4f9d07866b74064b369f6e67ab5 | [log] [tgz] |
|---|---|---|
| author | Matt Pietal <mpietal@google.com> | Thu Sep 15 19:04:15 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 15 19:04:15 2022 +0000 |
| tree | aaad0f522949f03b857632c12b865488216c9b0b | |
| parent | 841bc866be3282f3a976620250a4b56e4ea55e3e [diff] | |
| parent | 5933a823eaf3617284659d5aab4e9596f6a92fa2 [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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19641101 Change-Id: I8bacbadc785eef04db576759ab2943fab0ead497 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>