summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Achim Thesmann <achim@google.com> 2023-06-23 23:22:46 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-23 23:22:46 +0000
commit8ebcc0614a759d6de6529b6daa17d31c45ec86fa (patch)
tree0ed47fdf8a43b2367a3f923362b208d5441add0a /libs/androidfw/FileStream.cpp
parentca05453090adc09c345b25f72cdd30b80cf3ca76 (diff)
parent1b4f81fbf40f761ee0e041062d31961bc7991aeb (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: 1b4f81fbf4 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23477773 Change-Id: I5e559562405a7db07633973f938dedfeb312c31b 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