diff options
| author | 2024-01-27 01:40:53 +0000 | |
|---|---|---|
| committer | 2024-01-27 01:40:53 +0000 | |
| commit | c2a602f7d111425315c7eb0c2f364da58f7406c0 (patch) | |
| tree | 0f2ec427b1bb58982eca9a38fd73af54fae68bf0 /libs/androidfw/FileStream.cpp | |
| parent | d130c770db310cbb7283a125cc755f6acaa5eb07 (diff) | |
| parent | e6e71e08936558ce7935940e7890a1e48cbdf83a (diff) | |
[automerger skipped] Merge "isUserInLockDown can be true when there are other strong auth requirements" into rvc-dev am: 19075fd670 am: 976d59d1f9 am: 3201f76202 am: 8831b577c6 am: c8b6efab58 -s ours am: eee89b5a9f -s ours am: 0ec4ce1971 -s ours am: 36de1cab14 -s ours am: 7945a6e679 -s ours am: e6e71e0893 -s ours
am skip reason: Merged-In I5e979a7822dd7254b4579ab28ecf96df1db44179 with SHA-1 ba8dfc68aa is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25948484
Change-Id: I4fcbd5d722d02666532d2553b964564fed0cecc2
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