diff options
| author | 2023-09-29 22:56:18 +0000 | |
|---|---|---|
| committer | 2023-09-29 22:56:18 +0000 | |
| commit | f4cfdfa22a214de13c3c83afe01852ebfe5c44ee (patch) | |
| tree | e6ee21c6555ba11085667bcebffa1701055cf15b /libs/androidfw/AssetManager.cpp | |
| parent | d675a2aaf4590b05cca97f88caaade05ae199162 (diff) | |
| parent | 3974acaec3d45881107e8db3a958fc6d058e1f6c (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 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: I6de235ffea9408a27b913b994e078063d457f976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions