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:18:36 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-12-05 19:18:36 +0000
commitfbb307130b19b3fcbea1423c1ab299db139c023e (patch)
tree4b119687870c894ac6caf110222f7da998cb5a55 /libs/androidfw/FileStream.cpp
parentd8812ad5f083611d0630e32bc18d8f24094cff5a (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: I033b50df1611d75b3afb03bc3aec574169b1252c 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