| commit | e82eef9e2189b6a6023fa041ba5c97f60f0a3062 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 23:17:31 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 23:17:31 2023 +0000 |
| tree | 5ede10fd11f9e3d5f07c6ece27d2333fa19a0197 | |
| parent | 721f63fd6658b3c3627afebb34c7d2d97cfbe21c [diff] | |
| parent | 42b4ceb7bdb6799696a814478592660a16918ad1 [diff] |
[automerger skipped] Require permission to unlock keyguard am: 41bc7c0042 -s ours am: d7cadc0378 -s ours am: 0bfd492240 -s ours am: 0f15084990 -s ours am: 65f6794d8a -s ours am: 42b4ceb7bd -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: I7f6ecc2153d863ed34fc126c11ba78694e03f55f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>