summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Yao Chen <yaochen@google.com> 2023-09-29 21:55:32 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-29 21:55:32 +0000
commitb8afb1a8ce07f8534e93b30e3d58b458225730e6 (patch)
treec126fa3c3ec3dc758f8e81c97531efd221df652d /libs/androidfw/ObbFile.cpp
parent95ce9dcf546af91674b8c5b02188a3b0d864b328 (diff)
parent75883c0e643dc0584914f76c1288e70a1bb97ab0 (diff)
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into sc-dev am: 354107497d am: 7abb3af30e am: 546ca60c45 -s ours am: f5d9447527 -s ours am: 75883c0e64 -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/+/24605805 Change-Id: I18082601cfaeb6b23ef9b00ca6a09d998f26d6f4 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