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 17:34:05 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-12-05 17:34:05 +0000
commit2d5f75fca0415def64413f977f3dcf1bbe81164a (patch)
treed4359e0e0c607dc7244cb7328b89e605cd58e1bb /libs/androidfw/FileStream.cpp
parent6625000f1b4396d4219bc08ca6de2ad3e60f839a (diff)
parent7f0cf4bd3066eb1e8a69a878174a761655f6d2a1 (diff)
[automerger skipped] Merge "Handle screen capture disabled state for multiple users" into tm-dev am: 925eb31c07 am: 6932b02fb6 -s ours am: 2d25c9b0b5 -s ours am: 7f0cf4bd30 -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: I4ed748a1b2d034dad12f7ab4c1981d5b067e24cc 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