diff options
| author | 2023-09-30 01:09:03 +0000 | |
|---|---|---|
| committer | 2023-09-30 01:09:03 +0000 | |
| commit | c08eb1f92d834c845ebd81a2a3336fd009bebcd1 (patch) | |
| tree | 2b81556229c63dc55b59f1e551773fb34cb2d002 /libs/androidfw/ObbFile.cpp | |
| parent | bede531f6083c52df2b500704ff24ffa5abd365f (diff) | |
| parent | 59adaf5d6ca73cb96d8d6491da4a2f934c0837a3 (diff) | |
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into rvc-qpr-dev am: cf1a6b6131 -s ours am: b4c962e9c2 -s ours am: ff77cd4970 -s ours am: 5b33166e7e -s ours am: d03ed52184 -s ours am: eacebc1096 -s ours am: e165313a1c -s ours am: 3974acaec3 -s ours am: f4cfdfa22a -s ours am: 59adaf5d6c -s ours
am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 598dc664d4 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24608564
Change-Id: Ifd0e146bae2ebcc03da433659cd0da6790c38826
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