commit | 31a5f9dae577441e4d37c5f3e7a67f8ac8076bdb | [log] [tgz] |
---|---|---|
author | Matt Pietal <mpietal@google.com> | Thu Sep 15 19:05:59 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 15 19:05:59 2022 +0000 |
tree | 65b66ec2ee1099db7be3c862682ca6d0f75fc728 | |
parent | e9ccd9db503336f5af1c6558c74fa96cbde8db51 [diff] | |
parent | 5933a823eaf3617284659d5aab4e9596f6a92fa2 [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: 5933a823ea -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19641101 Change-Id: I0f4a497fdfa91fff50efc3c54dafe98269eea7a8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>