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