commit | 5bc29cdab22e80c0c7c1d660d62f2b26ae1211d4 | [log] [tgz] |
---|---|---|
author | Marzia Favaro <marziana@google.com> | Mon Sep 18 20:35:22 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 20:35:22 2023 +0000 |
tree | 22661ac57cd423cb3d5bb9356fa8b6b23d87f30f | |
parent | ca70fcde1fae64e2634f91ab702ecef640b946f0 [diff] | |
parent | e61a5274a582ae752d54d54ea12e303e4eb2df4d [diff] |
[automerger skipped] Require permission to unlock keyguard am: 7f28e3eaaf -s ours am: cbdde0eb62 -s ours am: f4eace9709 -s ours am: 7c2b1325e9 -s ours am: d5d56cf441 -s ours am: efa9ffae6a -s ours am: e61a5274a5 -s ours am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 712ec1f4f8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24339446 Change-Id: Iae23badade403e1842d51e2469365f4fca1d1638 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>