diff options
| author | 2023-09-18 22:27:21 +0000 | |
|---|---|---|
| committer | 2023-09-18 22:27:21 +0000 | |
| commit | 8028403e0965b74f7f45aed1943adbc46200d66c (patch) | |
| tree | b665ad8977b76f72750ccdac72984896e863f618 /libs/androidfw/FileStream.cpp | |
| parent | c154b270e760032096bf343c31fe39059acf2d2b (diff) | |
| parent | 9a04e08b0259bcf3aef812fee042803234bf39a1 (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: 9a04e08b02 -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: Ie974fc73fc716e81d05d4850cfc5f3309a0333b7
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