summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-08-25 21:04:23 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-25 21:04:23 +0000
commit8396238a06caafe0eaba71ee28fb11a6962195f7 (patch)
treea2040d6427ef83c7d9c8a9c097c0f0961328d009 /libs/androidfw/FileStream.cpp
parent1410630879972f142bcfe48a478916259b54f6df (diff)
parentdbea5619b9e89222afe31aa20ceabfdd57685682 (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE Unset StrongAuthFlags when unlocking a user profile" into tm-dev am: 5233950a66 am: 4090ce85f5 -s ours am: c4579e00df -s ours am: 1875efb1c1 -s ours am: 3ebea2bc2e -s ours am: dbea5619b9 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24270326 Change-Id: Ie0aeed6ac0eed1ab35117d6cd197b58c742aa5fd 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