| commit | 30316315ae3edd300c2daf2709a68eb031e74b39 | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Fri Sep 15 16:24:02 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 15 16:24:02 2023 +0000 |
| tree | 477b61c406cc65c39d2c2d7601507fd54709823b | |
| parent | 5173b7987e067bac4508066c7ec040a792a8ed78 [diff] | |
| parent | 78b272400f012870a4ea9ccbaa577e4d48bc8dbb [diff] |
[automerger skipped] Merge "Require permission to unlock keyguard" into rvc-dev am: 78b272400f -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: Ia6dd5dc6ce1587c4b046660d1ab542594447360c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>