commit | 5e35aad2a2a6cfe98f23472da002b8badaaf1ec0 | [log] [tgz] |
---|---|---|
author | Marzia Favaro <marziana@google.com> | Mon Sep 18 19:00:14 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 19:00:14 2023 +0000 |
tree | e90781ad8807230e77995bd0b11c6f8474bba90d | |
parent | 07731fb247a14ae04d825529060ac1630d856e06 [diff] | |
parent | 1bedc66ed3f71b2094a0bfcb7125baebe06f6c37 [diff] |
[automerger skipped] Require permission to unlock keyguard am: 41bc7c0042 -s ours am: 1bedc66ed3 -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1dc5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342145 Change-Id: I37d4c42e6112b2d67acd4b16222b6c373f979b61 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>