diff options
| author | 2023-09-30 06:12:16 +0000 | |
|---|---|---|
| committer | 2023-09-30 06:12:16 +0000 | |
| commit | 9190b62a9ffd86944158d62bbacf8c83359a9b6d (patch) | |
| tree | 2b81556229c63dc55b59f1e551773fb34cb2d002 /tools/aapt2/ResourceUtils.cpp | |
| parent | f8e928fd76308efd02a4ed74ea0b8cba7c7af4d0 (diff) | |
| parent | 04e27863efd747f5e0ee8d37e581a532619a2b1f (diff) | |
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into rvc-dev am: 61621c9510 -s ours am: b97477cde4 -s ours am: b4e7f02f13 -s ours am: a525c08da5 -s ours am: 372e2a4886 -s ours am: 3cc2961046 -s ours am: 1e4d3c7144 -s ours am: c11f2cce35 -s ours am: d9b29af5f0 -s ours am: 04e27863ef -s ours
am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 6fe53e86ed is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24607942
Change-Id: I0ab96a23c66578829bd845e338cb8b6ba78d48be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt2/ResourceUtils.cpp')
0 files changed, 0 insertions, 0 deletions