| commit | 2db7278f4fc781c8e1a08b8db4417619f67b9b74 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Fri Sep 15 22:54:13 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 15 22:54:13 2023 +0000 |
| tree | ea61edc92882f041e979741586ee6684e0005cb5 | |
| parent | 22d9145e2edd13e9ada1f8eb65be7794e612e1b8 [diff] | |
| parent | e7c49ecb45d19f95888afc98b51668242a160373 [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: 3fcc68b0f9 -s ours am: e7c49ecb45 -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: I46408b7b69966f6dac2e7d3ce16d5043ca964dab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>