diff options
| author | 2023-09-18 22:29:22 +0000 | |
|---|---|---|
| committer | 2023-09-18 22:29:22 +0000 | |
| commit | 0a63571cad4fa2031e8414d9bbfa6f9c76c2e3b6 (patch) | |
| tree | b665ad8977b76f72750ccdac72984896e863f618 /libs/androidfw/FileStream.cpp | |
| parent | 8b22a46bbe9b1cb18eccf8b17605fe0e05a8f4f3 (diff) | |
| parent | 01e980a9f5d8cd42fb380d8ba70fc520ca156bf0 (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: 01e980a9f5 -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: I791fa08252fec8365625e3ea5043a2f2d0a9b4fb
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