| commit | 9aab2e9f1f5305f93c35a24ca902f20e48dabf2a | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Fri Sep 15 20:53:23 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 15 20:53:23 2023 +0000 |
| tree | 2399ad67a9f64fe349e47f08e0eac7a15df895bc | |
| parent | 13f4d4f47161896862d1cc03abce63dcd4f3145a [diff] | |
| parent | af0c9c23757278dadaef42412b7d3bb7ab80ebc1 [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 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: Id4e2308c76a722e9c4e47e8fecefde020948b6f0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>