diff options
| author | 2023-09-20 11:29:05 +0000 | |
|---|---|---|
| committer | 2023-09-20 11:29:05 +0000 | |
| commit | 2fa2650e8b3ab8d9d5fa5464fc2b843eb0dd2533 (patch) | |
| tree | 07666361481c38137b92058ec9176cc77375e785 /libs/androidfw/FileStream.cpp | |
| parent | 6639abc0dcc96ae75a0972ade79f6acc36083c82 (diff) | |
| parent | b52e157b35b0c2765494a5b8b8878931e0591fa8 (diff) | |
[automerger skipped] Merge "Require permission to unlock keyguard" into tm-qpr-dev am: bc9059ae54 -s ours am: 3946267559 -s ours am: b52e157b35 -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: I3bbfd70968c03c1641bdce7ea8fcacb0ce5a3252
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