summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Yao Chen <yaochen@google.com> 2023-09-29 23:49:29 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-29 23:49:29 +0000
commit5e63a8d66cd1be764fc8cbffacb7f107261b1efc (patch)
tree890197c71c11fe7e9e8d4b46cec7a4e5994d561a /libs/androidfw/ObbFile.cpp
parent53f4619afe76ad38f0aec367d7544e292d9904b3 (diff)
parent1f5337557a5f980c61dbbb23dd42cf72fc7ac50f (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: 1f5337557a -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: Iefeb53b797cd54b1f46258511eac384c4c50f1f2 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