| commit | 76cf756a0ef693414443a0a389062761ff89bba2 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 15 20:20:48 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 15 20:20:48 2022 +0000 |
| tree | ecb3111aa9ab02885ffaad6655e0aeed769e7844 | |
| parent | cf5bc75905363ff3e5fa3586401f9a84ba669a81 [diff] | |
| parent | fd2105e9ac657aa102212c961cd1b0ccd39f2141 [diff] |
Merge "[automerger skipped] [automerge] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock 2p: 1e7087f113 am: 1bc514701a -s ours am: c64e0d7063 -s ours am: aff81a5527 -s ours am: 1b1dc203ba -s ours" into tm-d1-dev-plus-aosp am: fd2105e9ac -s ours am skip reason: Merged-In I7c8714a177bc85fbce92f6e8fe911f74ca2ac243 with SHA-1 1e7087f113 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19641101 Change-Id: I500ab3aa81a8daad9bbb9224658b8e612d0d8630 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>