diff options
| author | 2024-01-26 01:05:07 +0000 | |
|---|---|---|
| committer | 2024-01-26 01:05:07 +0000 | |
| commit | 8b274899ab283b4a4a5bf569bbe2a7333d1d4e2a (patch) | |
| tree | 8e4a0811995204717389c4ae3df6ad78a920a2be /libs/androidfw/FileStream.cpp | |
| parent | b28005e7fee615b140b6657d0cba6bb71354a452 (diff) | |
| parent | 5b5a20b58dc163c8da6a29fe58a344308d33a3ad (diff) | |
[automerger skipped] Merge "isUserInLockDown can be true when there are other strong auth requirements" into tm-dev am: 39515d49cb am: a4e73c73c5 -s ours am: ed2bb0b3f0 -s ours am: 008c390362 -s ours am: e90215d4b7 -s ours am: 5b5a20b58d -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: I105d1206711588fc17cbe7081aac17ebc290895b
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