| commit | 1a039f236efad5a6637b1f061589f852a14a977c | [log] [tgz] |
|---|---|---|
| author | Marzia Favaro <marziana@google.com> | Mon Sep 18 23:06:53 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 23:06:53 2023 +0000 |
| tree | 261dc8c3231b76008dfe261612e0025f8bfed58e | |
| parent | 2bfa4da9e5b8b2df7477078f080a66d8a0587e26 [diff] | |
| parent | 57e4f2bb6e858458df01a7afd8ddf85cdcbad595 [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: cef4976db0 -s ours am: 57e4f2bb6e -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: I7d4720b563e584b18c027aca6de37d620665a476 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>