diff options
| author | 2023-09-18 20:26:55 +0000 | |
|---|---|---|
| committer | 2023-09-18 20:26:55 +0000 | |
| commit | 6824b6d319ef9d3597e3916c513995a77aa4141b (patch) | |
| tree | 65e1358bf8c677a85c631bd0cdeaa641403da81c /libs/androidfw/FileStream.cpp | |
| parent | 5ab4a072f67b86e468c6891676a0a8ed54db646e (diff) | |
| parent | 06febd6d52b34bf9d4dcb9376b72fdbb84d14085 (diff) | |
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-v2-dev am: 0327955073 -s ours am: 5e73bd8193 -s ours am: 4eef0a5a1c -s ours am: f51a32c287 -s ours am: 06febd6d52 -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: I5fdf534bbc320de08d1eafb1b8cc7ef033c67d4f
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