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