| commit | e5ec0c6e37adb5e14f9419d35a8c1ef109281ddf | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Fri Sep 15 22:37:55 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 15 22:37:55 2023 +0000 |
| tree | 58bb8fca07ec3990d0219447fdd61fac64474c6c | |
| parent | 3033244596124bdf9ed2c779dae95338be6561a7 [diff] | |
| parent | e03b72452374cdf6f73e2f6aee93af645d39166d [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: d9fe035e60 -s ours am: d51ad40ab0 -s ours am: e03b724523 -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: Ie16aca13c0e8b90479c8b8f9f7d9005167e88b0f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>