diff options
| author | 2024-01-26 01:04:06 +0000 | |
|---|---|---|
| committer | 2024-01-26 01:04:06 +0000 | |
| commit | b28005e7fee615b140b6657d0cba6bb71354a452 (patch) | |
| tree | 8e4a0811995204717389c4ae3df6ad78a920a2be /libs/androidfw/FileStream.cpp | |
| parent | 61f7a873eff70c2117f71fc8450d1f2d4430a9c3 (diff) | |
| parent | c44db3b761a80182fc18206efdf836c97b636480 (diff) | |
[automerger skipped] Merge "isUserInLockDown can be true when there are other strong auth requirements" into tm-dev am: 39515d49cb am: bcac2c4240 -s ours am: ac804b26db -s ours am: ea5dc08aff -s ours am: c44db3b761 -s ours
am skip reason: Merged-In I5e979a7822dd7254b4579ab28ecf96df1db44179 with SHA-1 93149616ba is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25949515
Change-Id: Ia65355ddb74999a8d9a1ca6fe0fb095fd1f4ba39
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