diff options
| author | 2023-09-16 04:13:33 +0000 | |
|---|---|---|
| committer | 2023-09-16 04:13:33 +0000 | |
| commit | f7580e528d0da2f4437fc3172ff0eb06ac0c4c32 (patch) | |
| tree | 46177c9a7701d44dcb37c891ce9e0694a6d66320 /libs/androidfw/FileStream.cpp | |
| parent | 88e3a16606d99b6924c70fd4c2477acb8e593d3d (diff) | |
| parent | 8f99549b8f1c8a277351491cc110b03ad7fa8094 (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: 899dc4ee82 -s ours am: a79a951cf8 -s ours am: 0084bb7961 -s ours am: 3d18546a62 -s ours am: 8f99549b8f -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: I6fa3d0dc25990e8b5d71642857f2f378ee478d23
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