| commit | 03ab2128d81f56681c863d92267ce6e8c8bc7e5a | [log] [tgz] |
|---|---|---|
| author | Zixuan Qu <[email protected]> | Wed Sep 04 00:38:21 2024 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Wed Sep 04 00:38:21 2024 +0000 |
| tree | ba14aa336b1aa2d55897d5f3eeadfed9439ec9d7 | |
| parent | 06abef3fda9edab1c5c70fe777c7b9eb9be21e5a [diff] | |
| parent | 86b6608c9e41c64fc0fd7f64ddc29e796bae20f9 [diff] |
[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 <[email protected]>