summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Achim Thesmann <achim@google.com> 2023-06-24 00:12:30 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-24 00:12:30 +0000
commit59e4082e65a0471b491abca73cde0715e15c02cc (patch)
treef586d93f5b43a117f69557a8172e80c463494633 /libs/androidfw/ObbFile.cpp
parentbecd42d106f144f57e437e26dfd14dfd6dd05bcd (diff)
parentc4115c1c797d6dd129d362dc8d3c7454a49ff0c4 (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: 885fbbaec9 -s ours am: fbf1b74f02 -s ours am: c4115c1c79 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23477773 Change-Id: I7933e8c78a5117d3244d20e6c867fc9ad1bb8ae7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions