diff options
| author | 2023-09-18 22:28:36 +0000 | |
|---|---|---|
| committer | 2023-09-18 22:28:36 +0000 | |
| commit | 48eebc2e3909711da114492240393b9349c877a9 (patch) | |
| tree | b665ad8977b76f72750ccdac72984896e863f618 /libs/androidfw/FileStream.cpp | |
| parent | 40ec005e393ea27d3039c96222cda1ab9a1451f6 (diff) | |
| parent | 0122c6d80289693fbbd5f0f0da593b735c3187b3 (diff) | |
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-dev am: b25ee8669f -s ours am: c1e069ef40 -s ours am: 75495d90ae -s ours am: bedfad328a -s ours am: e17affc8d4 -s ours am: d6f9187710 -s ours am: 0122c6d802 -s ours
am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 712ec1f4f8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24339446
Change-Id: I03c1d24e3d0d376d6080c6d3334a84342ca0eaf6
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