| commit | 280910d0399e91a388b261b64082d035679e4784 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 14:15:04 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 14:15:04 2023 +0000 |
| tree | eb85f07986af2b73b78af1e5d3d51777ceb12c74 | |
| parent | 3cc39d59173e1a523d4e9a496631445d33bf561c [diff] | |
| parent | f45c923ae007c9e923c8cc1293c455412a5b1955 [diff] |
[automerger skipped] Require permission to unlock keyguard am: d41eb87422 -s ours am: 778fa05147 -s ours am: f45c923ae0 -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/+/24339445 Change-Id: I76bfaedb0cc699fc29b8cbeb9324d8be25271f65 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>