diff options
| author | 2023-09-18 20:23:52 +0000 | |
|---|---|---|
| committer | 2023-09-18 20:23:52 +0000 | |
| commit | 9a04e08b0259bcf3aef812fee042803234bf39a1 (patch) | |
| tree | 65e1358bf8c677a85c631bd0cdeaa641403da81c /libs/androidfw/FileStream.cpp | |
| parent | 9b3f26fa5ae3dbd66dd76cebbd8f083d3727ae47 (diff) | |
| parent | 184533c85618338bb1c10df1353836974455bc61 (diff) | |
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-v2-dev am: 0327955073 -s ours am: 5e73bd8193 -s ours am: 658c783266 -s ours am: 184533c856 -s ours
am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 41bc7c0042 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342147
Change-Id: I4c985d1684859716d968aab7f5147b9a64d116fa
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