diff options
| author | 2024-01-26 23:53:37 +0000 | |
|---|---|---|
| committer | 2024-01-26 23:53:37 +0000 | |
| commit | 1aaf0c36302ae1350692a31a0ed0fa7a2e3ff93d (patch) | |
| tree | 43b29bb7b31abaff3295752a86dc5a3fabf67ff5 /libs/androidfw/FileStream.cpp | |
| parent | addb0d3b6038231db273c15bb8471bfef7ef1cc3 (diff) | |
| parent | 7ed87acae9e04f354a39792b17940cc2c40d6fe3 (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: 7ed87acae9 -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: Icd8fbd909d866d7cc04bd08d5111b966746c9fdf
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