diff options
| author | 2023-09-20 10:25:51 +0000 | |
|---|---|---|
| committer | 2023-09-20 10:25:51 +0000 | |
| commit | b52e157b35b0c2765494a5b8b8878931e0591fa8 (patch) | |
| tree | 65e1358bf8c677a85c631bd0cdeaa641403da81c /libs/androidfw/FileStream.cpp | |
| parent | 578bc706556db7dfee7e991e610b6ea1da3c6ce4 (diff) | |
| parent | 3946267559f0a445eefda8e3823ba64848a9eef6 (diff) | |
[automerger skipped] Merge "Require permission to unlock keyguard" into tm-qpr-dev am: bc9059ae54 -s ours am: 3946267559 -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: I21a7d900651bbf1cb447e93c3d18b38c4830bdd7
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