commit | ebe216e84255f011bf0207359fe740a4e5b9a287 | [log] [tgz] |
---|---|---|
author | Marzia Favaro <marziana@google.com> | Mon Sep 18 19:45:51 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 19:45:51 2023 +0000 |
tree | 71e5b12a06e8eda0703b07a616806867c44c5241 | |
parent | 53c30c888be355e654351f16c0cf828e30f7311a [diff] | |
parent | 2dd64205b5bd4b6341e5cb0ea87f7965f4817562 [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 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: I055b813c0949bd28fde192c322a9c595e1e18b9a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>