diff options
| author | 2023-09-18 19:47:36 +0000 | |
|---|---|---|
| committer | 2023-09-18 19:47:36 +0000 | |
| commit | f983464e70643a679910b6b27fc20376d07a4dd0 (patch) | |
| tree | 71e5b12a06e8eda0703b07a616806867c44c5241 /libs/androidfw/BackupData.cpp | |
| parent | 0d7355ac7a46209e9ce414173d99cc3e210ef1e7 (diff) | |
| parent | 5c31ee97b03364d51b960ae9bd1c2657768b0154 (diff) | |
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-dev am: b25ee8669f -s ours am: c1e069ef40 -s ours am: 75495d90ae -s ours am: bedfad328a -s ours am: ed66255cab -s ours am: 1e4cc975ff -s ours am: 5c31ee97b0 -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: Ibc8393e87630fd2d132759f6f036a2129abaf04b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/BackupData.cpp')
0 files changed, 0 insertions, 0 deletions