| commit | 3fcc68b0f950babc90b8328e16226caf158d0e9f | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Fri Sep 15 21:41:15 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 15 21:41:15 2023 +0000 |
| tree | 305ee5f9fa7217500e5f5ebd7bf05f904137e5bf | |
| parent | 8a68b03e84f66a6dba891c1a73563571600f72fd [diff] | |
| parent | a8c8808a3295d5e2506e5bb0569b5bd94f6b2c49 [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: f4f4929a4d -s ours am: a8c8808a32 -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: Ib164e1e12725fc67c20b4647de018893c83b9104 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>