tree ba14aa336b1aa2d55897d5f3eeadfed9439ec9d7
parent c5bbafd8cb4975fb9ec20c700b2d54c706a55cea
parent 872b623251313fe616fe85d3eabece8ef263a62a
author Zixuan Qu <zixuanqu@google.com> 1725409723 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1725409723 +0000

Merge "Merged-In: Ib44e02ceac77164647a6ac0ba1d27187ff165686 Export `any.proto`." into main am: 872b623251

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

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