summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-12-05 21:01:32 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-12-05 21:01:32 +0000
commit368472e4090c19660f3fc5978f16dd710677a4ed (patch)
tree125f0f45c3a56a537ee94a3ec54577b3e89ccaee /libs/androidfw/FileStream.cpp
parent322c33590c2b5d743d80d57f25a4b525fa110e19 (diff)
parentd75c95b347d7b6f96275adaa3c94b621a6db5fbd (diff)
[automerger skipped] Merge "Handle screen capture disabled state for multiple users" into tm-dev am: 925eb31c07 am: 51ef433fd9 am: 8ef2cdc1e7 -s ours am: 1af69bd983 -s ours am: 42af64756c -s ours am: d75c95b347 -s ours
am skip reason: Merged-In I9da7b026e937a9e729777b4de613b319a4084418 with SHA-1 3b2c9426e4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25262286 Change-Id: I6045ac4910ee0564b7b4b08ac9cea205fe217ad1 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