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 19:16:04 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-12-05 19:16:04 +0000
commit42af64756c04805c2bb7af2527c37bcc269036d4 (patch)
tree7afe9621a131f4739a01323588551fe8fa50533a /libs/androidfw/FileStream.cpp
parent5326941827219862f2f421b627d74a5c668735bd (diff)
parent1af69bd98317ab571bfd374d213faf41619d9e07 (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 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: I94871ca92b7a6d10806e5afa0e569d70e4861eb6 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