| commit | 899dc4ee82f95044e9fc0b61c16b665a9ef29b9e | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Fri Sep 15 19:54:44 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 15 19:54:44 2023 +0000 |
| tree | 6840bfa8c6a1c5546610092e54cfdf2f4badb60b | |
| parent | d9fe035e6024cceed7f0ebfdee3a6b328ef8c36a [diff] | |
| parent | 8dd736d39c5c19da10356a050ba237ee2c1b11b4 [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into rvc-dev am: 78b272400f -s ours am: 30316315ae -s ours am: 8ba2179244 -s ours am: f72e484da4 -s ours am: 790fbfb359 -s ours am: 8dd736d39c -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: I7c676fe43fe02f4a3839cad0d720a0d35571d4d7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>