| commit | 311784c9a3127ab026f1554b953a00005db1dc4d | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 22:31:26 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 22:31:26 2023 +0000 |
| tree | b665ad8977b76f72750ccdac72984896e863f618 | |
| parent | 8a5b05a5b69eb3c05c9b7ab678d7c8fcd28f4e42 [diff] | |
| parent | 073cbbf9d8f75cb658f47ec0d4460ab4fe349a97 [diff] |
[automerger skipped] Require permission to unlock keyguard am: 7f28e3eaaf -s ours am: cbdde0eb62 -s ours am: f4eace9709 -s ours am: 7c2b1325e9 -s ours am: 219d6da566 -s ours am: 7b2ead4023 -s ours am: 2acb7db524 -s ours am: 073cbbf9d8 -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 712ec1f4f8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24339446 Change-Id: I776efc5093dd44d8a4feca95664012a625b02e4c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>