summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Yao Chen <yaochen@google.com> 2023-09-29 23:48:19 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-29 23:48:19 +0000
commitefcb9b2212ac2987abc9cb7ffdb1a045a4faa10d (patch)
tree890197c71c11fe7e9e8d4b46cec7a4e5994d561a /libs/androidfw/ObbFile.cpp
parentd8b9ed35ef5fb835b1bcd8a3556ee7ac4f093f86 (diff)
parent73cd0894ef2a722afcadbce891514b9abe2643cb (diff)
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into tm-dev am: 2ac86ba5c7 am: 58e1853aad -s ours am: 95ce9dcf54 -s ours am: 73cd0894ef -s ours
am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 5ae8b8102c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24608667 Change-Id: I8900cf0f709071982d794a41952d7a5075ec3696 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