diff options
| author | 2023-09-29 22:50:39 +0000 | |
|---|---|---|
| committer | 2023-09-29 22:50:39 +0000 | |
| commit | aef26617a24a4945ea874e70dd8976cbbff00529 (patch) | |
| tree | 2eb2a868b54f09438e0f46f608077151a7624500 /libs/androidfw/AssetManager2.cpp | |
| parent | 0f918b5a1c854b3a87980ee2d794e7f3aaff207f (diff) | |
| parent | 18696190183fbdf70be75f1c271fd5752e7ad66c (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: 7f3c529dd1 -s ours am: 1869619018 -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: Ia21e24743bd16c3fa73470e35f554abf6b0958a4
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