diff options
| author | 2023-09-20 13:12:59 +0000 | |
|---|---|---|
| committer | 2023-09-20 13:12:59 +0000 | |
| commit | 3068297afac86e054c2545c31435e34ea6bd6c96 (patch) | |
| tree | 7e601ddc54fead2ef664988dc4473dfad35f2d08 /libs/androidfw/FileStream.cpp | |
| parent | 65b9bde4a0b37f6e172b4c8e303f44c218f21e9c (diff) | |
| parent | 269c0cfe681cd226f07b9ecf547681128ec7493c (diff) | |
[automerger skipped] Merge "Require permission to unlock keyguard" into tm-qpr-dev am: bc9059ae54 -s ours am: 3946267559 -s ours am: 4bb98f38c5 -s ours am: 0a1d9d034c -s ours am: 269c0cfe68 -s ours
am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 6568e40be9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342146
Change-Id: I1801745abc05cb61617350b8c60d79df18474eaa
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