tree a6e91216051627284e3b8a1fc25ff2cd35059d76
parent c4da5b6f0a593941b6d6ed0c6f4e1d00bb68906c
parent d3cfb16399ff633310b193457e473753622e7149
author Xin Li <delphij@google.com> 1725674556 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1725674556 +0000

[automerger skipped] Merge 24Q3 to AOSP main am: d3cfb16399 -s ours

am skip reason: Merged-In I77d9c4ee152ba6554226a04e5a07abb95f4645ea with SHA-1 69f5d8443a is already in history

Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc-java/+/3258237

Change-Id: Ia03499d4377536e50a9731672ae1e7374e516cb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>