diff options
| author | 2023-09-15 19:55:20 +0000 | |
|---|---|---|
| committer | 2023-09-15 19:55:20 +0000 | |
| commit | f4f4929a4d42235088735bea90d70b8f8fb08a56 (patch) | |
| tree | 74e7ef040b9f4f8dcc356542909059e7fb504d3f /libs/androidfw/BackupHelpers.cpp | |
| parent | af0c9c23757278dadaef42412b7d3bb7ab80ebc1 (diff) | |
| parent | 8dd736d39c5c19da10356a050ba237ee2c1b11b4 (diff) | |
[automerger skipped] Merge "Require permission to unlock keyguard" into rvc-dev am: 78b272400f -s ours am: 30316315ae -s ours am: 8ba2179244 -s ours am: f72e484da4 -s ours am: 790fbfb359 -s ours am: 8dd736d39c -s ours
am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1dc5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24341231
Change-Id: I4c8d39572ddc4de0088f2115bff6f88cd1435eec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/BackupHelpers.cpp')
0 files changed, 0 insertions, 0 deletions