| commit | 2ae44f96ea2c2f33ac71e32fedf122e1b61b4ef5 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 20:36:31 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 20:36:31 2023 +0000 |
| tree | 22661ac57cd423cb3d5bb9356fa8b6b23d87f30f | |
| parent | ea01cd28ef358ae9116ff1830f8d6849b5e94b50 [diff] | |
| parent | ebe216e84255f011bf0207359fe740a4e5b9a287 [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: ebe216e842 -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: Ic4ff274fe94c983798a5015907c4ebc28df6393a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>