| commit | fe9642a2febfae7e5c918088122ea7e011601f1b | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 23:30:35 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 23:30:35 2023 +0000 |
| tree | 695593c9d63cd6d6c7ff43dfc4982029e98fc43e | |
| parent | 99462c6978777ae860a120b27efa25dd029ca488 [diff] | |
| parent | c25de5134cb13e7e77f82c36678ad1ac8bfb1a41 [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: 7344e5a881 -s ours am: fa157edcaf -s ours am: c25de5134c -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: I1b093736da0487977151b40f57f7518e0c2f2f97 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>