summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Yao Chen <yaochen@google.com> 2023-09-30 01:08:02 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-30 01:08:02 +0000
commiteb9975af2cc188d0112700e67dddbdd216384dd7 (patch)
tree2b81556229c63dc55b59f1e551773fb34cb2d002 /libs/androidfw/ObbFile.cpp
parentdfdc3978f104d6cc05bf4e38e08d3969bcb19c4e (diff)
parent5b2b03a2a66dc6c2b503e6e90a56a8e510c25456 (diff)
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into sc-qpr1-dev am: 34f6ef3664 -s ours am: 4a3587d70c -s ours am: 2230add689 -s ours am: eee8b8f052 -s ours am: 8ea60ca336 -s ours am: e7861a65a3 -s ours am: abb6a54f96 -s ours am: 5b2b03a2a6 -s ours
am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 db60b2f5e0 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24607943 Change-Id: I6828ad4f59b6fbcb5b482f20ef05b4a5d72cc66b 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