diff options
| author | 2023-09-18 20:26:01 +0000 | |
|---|---|---|
| committer | 2023-09-18 20:26:01 +0000 | |
| commit | 01e980a9f5d8cd42fb380d8ba70fc520ca156bf0 (patch) | |
| tree | 65e1358bf8c677a85c631bd0cdeaa641403da81c /libs/androidfw/FileStream.cpp | |
| parent | ae005b22a16ddb5409d7638ba5945ccafae61f0d (diff) | |
| parent | 53937710031cb2f4fec03d422e77cd934ef96443 (diff) | |
[automerger skipped] Merge "Require permission to unlock keyguard" into tm-dev am: 1d243469a6 -s ours am: 2964d2acf8 -s ours am: 5bc4960863 -s ours am: 5393771003 -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/+/24342145
Change-Id: Iedf1dead783665c73f35b188c83db58c07a7f1e1
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