diff options
| author | 2023-09-18 15:20:23 +0000 | |
|---|---|---|
| committer | 2023-09-18 15:20:23 +0000 | |
| commit | 57db6a96a0c459e1e2e987ced1dcac46faf5e86b (patch) | |
| tree | 8f82e2d9b7a96ac5256533030f68b244831bbaed /libs/androidfw/FileStream.cpp | |
| parent | 490a67201b529891d8bb6ba9da8fd2b02ec4858b (diff) | |
| parent | e78317648d0d5a58f6476223fa0a95ed51c89a29 (diff) | |
[automerger skipped] Merge "Require permission to unlock keyguard" into udc-dev am: 07731fb247 -s ours am: 8e87b86453 -s ours am: ae0a9fd780 -s ours am: e78317648d -s ours
am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1dc5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24339445
Change-Id: I376a47da016fec6b5b945dfd39e69346a7875fb1
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