summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Yao Chen <yaochen@google.com> 2023-09-29 22:52:26 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-29 22:52:26 +0000
commit1f5337557a5f980c61dbbb23dd42cf72fc7ac50f (patch)
treee6ee21c6555ba11085667bcebffa1701055cf15b /libs/androidfw/ObbFile.cpp
parentea974c9a17d816ee63bf134de0e34d1c52b90855 (diff)
parentac83acc21f5f2130a73887049cb8ba41707e69bb (diff)
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into sc-v2-dev am: 7071381e4c -s ours am: 7aeb7533c5 -s ours am: 83fd239996 -s ours am: ac83acc21f -s ours
am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 6fe75d9d37 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24605806 Change-Id: Ic2f5a34bbe3f86529bdc58e55220ed44b248d9c3 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