diff options
| author | 2023-09-29 23:48:55 +0000 | |
|---|---|---|
| committer | 2023-09-29 23:48:55 +0000 | |
| commit | 13927405a360b1c426412c42de8fa9a49a74c6d8 (patch) | |
| tree | 890197c71c11fe7e9e8d4b46cec7a4e5994d561a /libs/androidfw/ObbFile.cpp | |
| parent | efcb9b2212ac2987abc9cb7ffdb1a045a4faa10d (diff) | |
| parent | a8243667b63960fe1395af8fda00f8e66f6e0f2b (diff) | |
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into sc-dev am: 354107497d am: 7abb3af30e am: 546ca60c45 -s ours am: f5d9447527 -s ours am: 75883c0e64 -s ours am: b8afb1a8ce -s ours am: a8243667b6 -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/+/24605805
Change-Id: If2dc78411679fa6a76eb4e8db8c6131c72f8a20a
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