diff options
| author | 2023-09-18 19:41:59 +0000 | |
|---|---|---|
| committer | 2023-09-18 19:41:59 +0000 | |
| commit | 06febd6d52b34bf9d4dcb9376b72fdbb84d14085 (patch) | |
| tree | e90781ad8807230e77995bd0b11c6f8474bba90d /libs/androidfw/ConfigDescription.cpp | |
| parent | 2dd64205b5bd4b6341e5cb0ea87f7965f4817562 (diff) | |
| parent | f51a32c2870d40e294de86618a802259ab0e22b0 (diff) | |
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-v2-dev am: 0327955073 -s ours am: 5e73bd8193 -s ours am: 4eef0a5a1c -s ours am: f51a32c287 -s ours
am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 41bc7c0042 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342147
Change-Id: I510f270f3fba2a77537ba559a99b2a74effab4c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ConfigDescription.cpp')
0 files changed, 0 insertions, 0 deletions