summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Achim Thesmann <achim@google.com> 2023-06-23 20:58:54 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-23 20:58:54 +0000
commitdb3d618b8adb6ea3857496840979f99d747c0365 (patch)
tree81449dd69615bc85cfb39703e3b717b4a48fb525 /libs/androidfw/FileStream.cpp
parent2d3d68955d068fe523aaa09c1a4d565af1b8f729 (diff)
parent080a59fefbd9f80ae5f022736f130f0575bfe32e (diff)
[automerger skipped] Merge "Ignore virtual presentation windows - RESTRICT AUTOMERGE" into sc-v2-dev am: 5c30e642f7 -s ours am: bc70926f90 -s ours am: 080a59fefb -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23475534 Change-Id: I48430d8ca99769927ecc943803bb6c95c82aa368 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