diff options
| author | 2023-09-18 22:19:16 +0000 | |
|---|---|---|
| committer | 2023-09-18 22:19:16 +0000 | |
| commit | 92475fa2154282edcea4ab1da929b2052dcf30da (patch) | |
| tree | 74a42c83567bf91f47c8ab123b7c177047de36bc /libs/androidfw/BackupData.cpp | |
| parent | 187aace6a73af1c5622d0f769e4fac9964620c0e (diff) | |
| parent | d37d6b74daa6238c60570c47d3b008d2b90ba07c (diff) | |
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-qpr1-dev am: aac427df4c -s ours am: 8fbbc0c975 -s ours am: 3371c14a70 -s ours am: 306ac20464 -s ours am: 8f78484790 -s ours am: 3b02f9e5bd -s ours am: d37d6b74da -s ours
am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 6568e40be9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342144
Change-Id: Ic2c74a1d90b178f82d76f68460f7d9377eca8d8b
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