diff options
| author | 2023-09-18 22:30:15 +0000 | |
|---|---|---|
| committer | 2023-09-18 22:30:15 +0000 | |
| commit | a3593ecc1814a6ad46ea59c1198baf9cc3501dce (patch) | |
| tree | b665ad8977b76f72750ccdac72984896e863f618 /libs/androidfw/FileStream.cpp | |
| parent | a06139029cd9c79173c2fe486a32981d9ec5afa8 (diff) | |
| parent | 6824b6d319ef9d3597e3916c513995a77aa4141b (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: 6824b6d319 -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: I0735d43e6bda0e3cd09995b5dc1a34a2b77986c4
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