commit | ea9e51e3cd62ff8e26c18d4d3c6e660abbbdabdd | [log] [tgz] |
---|---|---|
author | Marzia Favaro <marziana@google.com> | Fri Sep 15 17:14:00 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 15 17:14:00 2023 +0000 |
tree | c9ef7efacd771ffb6c0838a07a6364b048b38407 | |
parent | 4397e74103292ad5a22f264b1816ece00fcb0442 [diff] | |
parent | 5173b7987e067bac4508066c7ec040a792a8ed78 [diff] |
[automerger skipped] Require permission to unlock keyguard am: ad8e7e3b1d -s ours am: 5173b7987e -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: I2dd9b54329239efb9ed742737ebd4e9f046b7c1e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>