| commit | ba20b789ad2ea88977b1e7df1f02a81a9fca0d97 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Sep 19 22:07:46 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 19 22:07:46 2022 +0000 |
| tree | a017bded19a652747d8a64a2ff142b746d83ba11 | |
| parent | 199f8545358ecaa1f2623bcfafaee8a1e1617671 [diff] | |
| parent | 29e4cb4416bec569475f34339078b156ebcab5a3 [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: 29e4cb4416 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19667859 Change-Id: I7c2e3c4a18bf1ed46e154e76b9843e66a493103b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>