| commit | 13b69bdcda66d8526ac08a99f7b026856dcf41d2 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 17:19:50 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 17:19:50 2023 +0000 |
| tree | 34c174bc02a2739b2756df8566946dae3e0bc515 | |
| parent | bb627dfeb3e7f58431fc5d1754d2f4d198d8b1b9 [diff] | |
| parent | 33902126bb4be09ea622d8c42fe3e1b2bcbf114a [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into rvc-qpr-dev am: 324d8033ba am: 4397e74103 am: 89a3862e5d am: 8aaad2a211 am: c4e7a6081e am: 17405aa591 am: 13f4d4f471 -s ours am: aa805d1ff6 -s ours am: 33902126bb -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/+/24341230 Change-Id: I90ad0161bef96cdb9fbadabdd632e01a2eb69c93 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>