diff options
| author | 2024-01-26 23:55:51 +0000 | |
|---|---|---|
| committer | 2024-01-26 23:55:51 +0000 | |
| commit | cba51eb2af4768b0c72b9f6aa25bf915725d47ee (patch) | |
| tree | 3e150165aad48100c3e8486d9846ed5dc4676110 /libs/androidfw/FileStream.cpp | |
| parent | d1994f432c43b660a05edf870353117d17b1c297 (diff) | |
| parent | 6d37ac0e4853a512396dee8cca443b9bdf161b8f (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: 627c16f24c -s ours am: 89c37a5dd4 -s ours am: 6d37ac0e48 -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: I0b5b54bd0f3a1fbf7dc9b5431ef5d56f6bece92a
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