diff options
| author | 2023-09-20 13:16:38 +0000 | |
|---|---|---|
| committer | 2023-09-20 13:16:38 +0000 | |
| commit | 5ffe1e3e1b691822b7fa6183bdaa473aaf8db489 (patch) | |
| tree | 7e601ddc54fead2ef664988dc4473dfad35f2d08 /libs/androidfw/FileStream.cpp | |
| parent | ab4dd0203aabda79d86c0c347b83792e4b91630e (diff) | |
| parent | 534a6b975fd178cb2659a15fc46e91be0a866bd3 (diff) | |
[automerger skipped] Merge "Require permission to unlock keyguard" into tm-qpr-dev am: bc9059ae54 -s ours am: 3946267559 -s ours am: 4bb98f38c5 -s ours am: d64343cb4c -s ours am: 534a6b975f -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/+/24342146
Change-Id: Ib86d006dd2313b2d9bb4d009439beb30c409a042
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions