summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Achim Thesmann <achim@google.com> 2023-06-23 22:32:15 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-23 22:32:15 +0000
commit1b4f81fbf40f761ee0e041062d31961bc7991aeb (patch)
tree7e8d3f3dc708f04fbf82e1bb68c08e34fc261452 /libs/androidfw/FileStream.cpp
parentff65444a606f84cdf245b83cfb3054be1224de10 (diff)
parent1f073050bce5ad964ad32156ebf7bafa40dab7b5 (diff)
[automerger skipped] Merge "Ignore virtual presentation windows - RESTRICT AUTOMERGE" into sc-dev am: 9857a30885 am: d8d7da3ffc -s ours am: 3114e188f5 -s ours am: 1f073050bc -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23477773 Change-Id: I927b52c37fcab8954cf003495300d80a706182e8 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