| commit | fdcfaa35f007978dd5769bad79cabf9b539fa56e | [log] [tgz] |
|---|---|---|
| author | Matt Pietal <mpietal@google.com> | Thu Sep 15 20:59:31 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 15 20:59:31 2022 +0000 |
| tree | 9101d80e8b08e3b5bea56695ea3c4d47bf73edc6 | |
| parent | 8aae700c24af87c1f99ed9982496a6d01b41c811 [diff] | |
| parent | 43d027b69b518a904dccbf4c0364f8e76629d3ce [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: c3657db71e -s ours am: d7cf9b4bcb -s ours am: 43d027b69b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19641101 Change-Id: Ibef7c94991f6009818fde229bff7c3735be62cfe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>