| commit | dea5d660ef17dbb8ee08582d2929ad2283faf5ff | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Feb 23 22:10:12 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 23 22:10:12 2023 +0000 |
| tree | f72082ccc8290c1142a202d2f872bcdc6bd17816 | |
| parent | 03f301f53cd602027706be5eaafbdc51e6426d64 [diff] | |
| parent | 2dc68a9db2948fd8adeefac0ad4deb2a03ae48d2 [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: 2dc68a9db2 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19667859 Change-Id: Ib0594b38b3b621e6e7ecdd251b21f4c5d8e9b2c3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>