| commit | 7b2ead4023dc0a87df07385aa86e065f1d6fb947 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 18:55:04 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 18:55:04 2023 +0000 |
| tree | 2399ad67a9f64fe349e47f08e0eac7a15df895bc | |
| parent | 8f78484790aa0cf1cce239ca47021afaa575e44d [diff] | |
| parent | 219d6da5668ea1f593ef5598772e47b3a6ab4c7d [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 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: Ied69e349f276714c368d8f22969edacb86707f3e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>