| commit | d51ad40ab041ee23bc466dff40c0e24121e570a4 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Fri Sep 15 21:01:53 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 15 21:01:53 2023 +0000 |
| tree | 305ee5f9fa7217500e5f5ebd7bf05f904137e5bf | |
| parent | ff53f5a27357e1d609afa0d26e6b3311d109473d [diff] | |
| parent | d9fe035e6024cceed7f0ebfdee3a6b328ef8c36a [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: d9fe035e60 -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: I48f66352d3ccc534d6839d871e2a2dc1da367b7b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>