| commit | 3743abeff9bb85637c1d03ec34a55895d3011fbe | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 14:26:35 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 14:26:35 2023 +0000 |
| tree | 44ce592f066fe05982bc94b7d75e532b9bd431bc | |
| parent | 674653c1c8e1222d3918196833015c1d9e480f24 [diff] | |
| parent | ed480a790f59dd9853b21f35a17ff1139554e2c1 [diff] |
[automerger skipped] Require permission to unlock keyguard am: d41eb87422 -s ours am: 778fa05147 -s ours am: ed480a790f -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/+/24339445 Change-Id: I2f6e3706721a0dedd390e98662339a1f0feebd82 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>