| commit | 38498a69d0fa819b641c03005ea639875dc50661 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 22:18:44 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 22:18:44 2023 +0000 |
| tree | 74a42c83567bf91f47c8ab123b7c177047de36bc | |
| parent | 79bb2bdef0e9b55cad0fe34942c79cc56c8ebffb [diff] | |
| parent | d8bd738d8df67c367211a5d42d3d11afab53286c [diff] |
[automerger skipped] Require permission to unlock keyguard am: 6568e40be9 -s ours am: 57e16d7fa7 -s ours am: d577fd099b -s ours am: 64fd1622ca -s ours am: 2dd64205b5 -s ours am: d8bd738d8d -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 41bc7c0042 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342147 Change-Id: I59675118ba610e8763a52d10cb450387b840aeb4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>