summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Achim Thesmann <achim@google.com> 2023-06-24 02:04:44 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-24 02:04:44 +0000
commit1aa9875329deed6f16426f0d79f62f4caaa9488e (patch)
tree0ed47fdf8a43b2367a3f923362b208d5441add0a /libs/androidfw/FileStream.cpp
parentbda48fd600fd3f1e924e70288548585efb09fce9 (diff)
parent9617c949181071e20d1447abb65c45a6d765e65b (diff)
[automerger skipped] Merge "Ignore virtual presentation windows - RESTRICT AUTOMERGE" into rvc-dev am: c424f6ec8c am: a18f931aaa -s ours am: 8c66a8b3c7 -s ours am: 9b6816efc4 -s ours am: edeff9328e -s ours am: 9c0d0d918f -s ours am: badf04a64e -s ours am: 9617c94918 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23687079 Change-Id: I00b67e7665f01fd7a4f36018a5111b28d2b9704d 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