| commit | a8f655bc82850d2f4c2d745e1491ce9834aa672e | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Fri Sep 15 22:38:41 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 15 22:38:41 2023 +0000 |
| tree | 58bb8fca07ec3990d0219447fdd61fac64474c6c | |
| parent | f4ed1e540678a0ae54661ad023c0e43e1fdd9009 [diff] | |
| parent | bcffca459020f1318fe2ec25274ddd495d559fc1 [diff] |
[automerger skipped] Require permission to unlock keyguard am: ad8e7e3b1d -s ours am: 5173b7987e -s ours am: ea9e51e3cd -s ours am: 620b89a869 -s ours am: 7c2f597c46 -s ours am: 511dee9523 -s ours am: af0c9c2375 -s ours am: 9aab2e9f1f -s ours am: 8a68b03e84 -s ours am: bcffca4590 -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/+/24341231 Change-Id: Ida520b47d752bb028037496b4695305b05cfa870 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>