commit | 6ec6ea0cb35bc8dd5dbee45ae366dc8d68272c13 | [log] [tgz] |
---|---|---|
author | Marzia Favaro <marziana@google.com> | Mon Sep 18 23:21:12 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 23:21:12 2023 +0000 |
tree | 04f8b035c0d08560e0661e17e574969a3f279c43 | |
parent | 432a6322ced81e2bebcbe91fd2bbec7d1ffa3985 [diff] | |
parent | c04c73dbfdf7a91448727019ded8476708554c32 [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: 5bc29cdab2 -s ours am: c04c73dbfd -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: I2afb36b41622a6c3f455af08c24adc321821b7c4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>