summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Yao Chen <yaochen@google.com> 2023-09-29 22:53:52 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-29 22:53:52 +0000
commit3e000487f23861b57b0227cf8171de5b3be6b1e2 (patch)
treee6ee21c6555ba11085667bcebffa1701055cf15b /libs/androidfw/ObbFile.cpp
parentd68be37f288939a6e77e0635afcd9a94ebc91d04 (diff)
parentf76d9d111b3cbe1844bff4fba8a1dc2520b379a3 (diff)
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into tm-dev am: 2ac86ba5c7 am: f48fc72063 am: c14bc79a8a -s ours am: f76d9d111b -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/+/24608667 Change-Id: I67de84d775cc4ad160a1808f7c47dbc0ff93e980 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