diff options
| author | 2023-09-29 22:50:05 +0000 | |
|---|---|---|
| committer | 2023-09-29 22:50:05 +0000 | |
| commit | a036ba6ff0502503ac3e5e52ac69560cc963b098 (patch) | |
| tree | 2eb2a868b54f09438e0f46f608077151a7624500 /libs/androidfw/AssetManager2.cpp | |
| parent | 3929424d3997a62dee6cdc9e1f0a0fd7635f288a (diff) | |
| parent | da70c621acbfb2e0767d9fc4aec66a02f25a7de8 (diff) | |
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into sc-qpr1-dev am: 34f6ef3664 -s ours am: 4a3587d70c -s ours am: 2230add689 -s ours am: e15a749eb7 -s ours am: da70c621ac -s ours
am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 db60b2f5e0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24607943
Change-Id: Ica839a43d8986ca5c4203ac0c568446936b25820
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager2.cpp')
0 files changed, 0 insertions, 0 deletions