diff options
author | 2023-09-30 03:02:32 +0000 | |
---|---|---|
committer | 2023-09-30 03:02:32 +0000 | |
commit | 63d7a8779239c4172c66f4391329ed9f3188bc80 (patch) | |
tree | bab5d22478d8123cad6849e7ab59fad798444e64 /libs/androidfw/ObbFile.cpp | |
parent | 1b1627cc04e42aa11048e738b93e1255321e37e8 (diff) | |
parent | a6ab3cf357fd520aab0d74e5132b8b05b244bf2c (diff) |
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into rvc-dev am: 61621c9510 -s ours am: b97477cde4 -s ours am: b4e7f02f13 -s ours am: a525c08da5 -s ours am: 372e2a4886 -s ours am: 3cc2961046 -s ours am: a6ab3cf357 -s ours
am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 6fe53e86ed is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24607942
Change-Id: I912410af29865549711f68197f46aad862b5878a
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