commit | 3f83e911be6ec0e70dce60e4c75c42af6ebaa63f | [log] [tgz] |
---|---|---|
author | Marzia Favaro <marziana@google.com> | Mon Sep 18 22:16:23 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 22:16:23 2023 +0000 |
tree | 74a42c83567bf91f47c8ab123b7c177047de36bc | |
parent | a59465bb30bb72a1c924ea29986a165f984419d4 [diff] | |
parent | 1d42887320cd0017d43697976ff65a6a48270bf8 [diff] |
[automerger skipped] Require permission to unlock keyguard am: 41bc7c0042 -s ours am: 1bedc66ed3 -s ours am: 5e35aad2a2 -s ours am: 1d42887320 -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1dc5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342145 Change-Id: I67ebd11b1306d5954e407ec91ab536ed8eefade6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>