diff options
| author | 2023-09-30 06:01:51 +0000 | |
|---|---|---|
| committer | 2023-09-30 06:01:51 +0000 | |
| commit | fdec043c74722c00ad445acf5305069aed065b3c (patch) | |
| tree | 2b81556229c63dc55b59f1e551773fb34cb2d002 /libs/androidfw/ZipFileRO.cpp | |
| parent | 6fb910407762c3ec5a6eb583526872e136945d6b (diff) | |
| parent | 27d6b3a5b0365d92ac58e4f938a47e867f136bd3 (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: 1e4d3c7144 -s ours am: c11f2cce35 -s ours am: d9b29af5f0 -s ours am: 27d6b3a5b0 -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: I9c9f6a4c6abc289a7a6ec2557c836fa652ca8b12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions