commit | aa49d5c0d08f2182bfb761f1041d6b90d9881b00 | [log] [tgz] |
---|---|---|
author | Marzia Favaro <marziana@google.com> | Mon Sep 18 20:26:42 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 20:26:42 2023 +0000 |
tree | a731a05dd2f75880024316c60d3b8f8393fc0541 | |
parent | 337a5c868123c93e50ef89a9d622a5983650f3c5 [diff] | |
parent | 304b92883cba77abe6dc14f5785ba0ca7805d4b9 [diff] |
[automerger skipped] Require permission to unlock keyguard am: 6568e40be9 -s ours am: 57e16d7fa7 -s ours am: 1c170fba5f -s ours am: 304b92883c -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: I0e3ccb35fff229072d27877be74608c7f6d9bdc9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>