summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Yao Chen <yaochen@google.com> 2023-09-29 23:50:12 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-29 23:50:12 +0000
commit7d196c9480af75b4f68302215c40d8c89cf614e6 (patch)
tree890197c71c11fe7e9e8d4b46cec7a4e5994d561a /libs/androidfw/ObbFile.cpp
parentda3e1e59f07fe2ee8c96b5e3b44e0b8d935a7736 (diff)
parentb400b298d3f49ba6729997fc1520d31e9d629297 (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: e15a749eb7 -s ours am: da70c621ac -s ours am: b400b298d3 -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: I032425b3f10444e2d4c27955f084fda7278e9789 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