commit | 8a68b03e84f66a6dba891c1a73563571600f72fd | [log] [tgz] |
---|---|---|
author | Marzia Favaro <marziana@google.com> | Fri Sep 15 21:40:51 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 15 21:40:51 2023 +0000 |
tree | 305ee5f9fa7217500e5f5ebd7bf05f904137e5bf | |
parent | aa805d1ff6cba73788b84255a34e5fe3e6da55af [diff] | |
parent | 9aab2e9f1f5305f93c35a24ca902f20e48dabf2a [diff] |
[automerger skipped] Require permission to unlock keyguard am: ad8e7e3b1d -s ours am: 5173b7987e -s ours am: ea9e51e3cd -s ours am: 620b89a869 -s ours am: 7c2f597c46 -s ours am: 511dee9523 -s ours am: af0c9c2375 -s ours am: 9aab2e9f1f -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/+/24341231 Change-Id: If3b63d43889d39e7d6836ad67a23875e22025f16 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>