| commit | 29e4cb4416bec569475f34339078b156ebcab5a3 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Sep 19 21:38:25 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 19 21:38:25 2022 +0000 |
| tree | 1915fe650f58506eef67388285071d71a3dec772 | |
| parent | 9f605a6fe112319d34ab2ce42b5560e0322f29cd [diff] | |
| parent | e8b730b5527a39713c21783e385afe8ef4eeef59 [diff] |
[automerger skipped] Merge "[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock" into qt-dev am: c184d7b721 am: f3c6684b16 -s ours am: 5ddcc96b01 -s ours am: b7075acb14 -s ours am: 97f625773a -s ours am: 605261cc55 -s ours am: 1e7904ddd3 -s ours am: e8b730b552 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19667859 Change-Id: I74a5689afcd2c619d3b2c620af6e5629180203ac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>