summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-01-26 00:18:42 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-01-26 00:18:42 +0000
commitc44db3b761a80182fc18206efdf836c97b636480 (patch)
tree544a683f38668618f2c2bd399bbda4325bb32e93 /libs/androidfw/FileStream.cpp
parenta08e0b3fc08cbdd468c08235e0a32dfd2c526f3e (diff)
parentea5dc08aff83df2ed4d6a8cf496880feb15399b0 (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 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: Ide707f88e67135e393b91992b9e6ed3a0dacf410 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