tree ba14aa336b1aa2d55897d5f3eeadfed9439ec9d7
parent 06abef3fda9edab1c5c70fe777c7b9eb9be21e5a
parent 86b6608c9e41c64fc0fd7f64ddc29e796bae20f9
author Zixuan Qu <zixuanqu@google.com> 1725410301 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1725410301 +0000

[automerger skipped] Merge "Merged-In: Ib44e02ceac77164647a6ac0ba1d27187ff165686 Export `any.proto`." into main am: 872b623251 am: 86b6608c9e -s ours

am skip reason: Merged-In Ib44e02ceac77164647a6ac0ba1d27187ff165686 with SHA-1 a371378076 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/3250475

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