| commit | a79a951cf8e106eced7d08c1667f167d4aa9c7b5 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Fri Sep 15 21:02:10 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 15 21:02:10 2023 +0000 |
| tree | 305ee5f9fa7217500e5f5ebd7bf05f904137e5bf | |
| parent | d51ad40ab041ee23bc466dff40c0e24121e570a4 [diff] | |
| parent | 899dc4ee82f95044e9fc0b61c16b665a9ef29b9e [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into rvc-dev am: 78b272400f -s ours am: 30316315ae -s ours am: 8ba2179244 -s ours am: f72e484da4 -s ours am: 790fbfb359 -s ours am: 8dd736d39c -s ours am: 899dc4ee82 -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: I7ef1f8795e8bd4ea54b33f8fbeabc1561e1b6eed Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>